summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorPaul Eggert <eggert@cs.ucla.edu>2011-12-11 21:32:49 -0800
committerPaul Eggert <eggert@cs.ucla.edu>2011-12-11 21:32:49 -0800
commit333f9019e29e9b6de3a7ec07448be1d364ba540b (patch)
treefd19625604abbd2784e9c9de92c613ff965ea11d /src
parent11636b221d2897aed5ca9a762d7b61afd20b6168 (diff)
Spelling fixes.
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog.106
-rw-r--r--src/ChangeLog.26
-rw-r--r--src/alloc.c2
-rw-r--r--src/editfns.c2
-rw-r--r--src/emacs.c2
-rw-r--r--src/fontset.c2
-rw-r--r--src/ftfont.c2
-rw-r--r--src/lastfile.c3
-rw-r--r--src/lread.c2
-rw-r--r--src/nsfont.m2
-rw-r--r--src/region-cache.c4
-rw-r--r--src/region-cache.h4
-rw-r--r--src/termhooks.h4
-rw-r--r--src/xfns.c8
14 files changed, 24 insertions, 25 deletions
diff --git a/src/ChangeLog.10 b/src/ChangeLog.10
index e759183724..53f7a01665 100644
--- a/src/ChangeLog.10
+++ b/src/ChangeLog.10
@@ -15816,14 +15816,14 @@
Add prototypes.
* macterm.c (mac_draw_bitmap): Add overlay_p arg.
- (x_draw_fringe_bitmap): Handle overlayed fringe bitmaps;
+ (x_draw_fringe_bitmap): Handle overlaid fringe bitmaps;
thanks to YAMAMOTO Mitsuharu for advice on how to do this.
Use cursor color for displaying cursor in fringe.
(x_redisplay_interface): Add null handlers for
define_fringe_bitmap and destroy_fringe_bitmap functions.
* w32term.c (w32_draw_fringe_bitmap): Copy unadapted code from
- xterm.c to handle overlayed fringe bitmaps and to use cursor color
+ xterm.c to handle overlaid fringe bitmaps and to use cursor color
for displaying cursor in fringe.
(w32_define_fringe_bitmap, w32_destroy_fringe_bitmap): New W32
specific functions to define and destroy fringe bitmaps in fringe_bmp.
@@ -15849,7 +15849,7 @@
(display_line): Handle cursor in fringe at eob.
(display_line): Set row user fringe bitmaps from iterator.
- * xterm.c (x_draw_fringe_bitmap): Handle overlayed fringe bitmaps.
+ * xterm.c (x_draw_fringe_bitmap): Handle overlaid fringe bitmaps.
Use cursor color for displaying cursor in fringe.
(x_redisplay_interface): Add null handlers for
define_fringe_bitmap and destroy_fringe_bitmap functions.
diff --git a/src/ChangeLog.2 b/src/ChangeLog.2
index ba61c337ef..d3be006461 100644
--- a/src/ChangeLog.2
+++ b/src/ChangeLog.2
@@ -2254,7 +2254,7 @@
Initialize save_color.
* fileio.c, search.c, sysdep.c, filelock.c, editfns.c, process.c:
- Delete/replace unused/conditionalised variables
+ Delete/replace unused/conditionalized variables
1987-01-15 Richard M. Stallman (rms@prep)
@@ -2632,7 +2632,7 @@
* fns.c: Fding requires an arg; pass Qnil.
* m-alliant.h: define TEXT_START as 0x1000.
- Don't define LIBS_STANDARD; the default (sharable) library
+ Don't define LIBS_STANDARD; the default (shareable) library
is said to work now.
* alloc.c (mark_object): Now pass address of slot being marked.
@@ -4220,7 +4220,7 @@
Increase PURESIZE again (sigh)
* unexec.c (write_segment):
- Kludgey coercions ("(int)") to get this line to compile:
+ Kludgy coercions ("(int)") to get this line to compile:
nwrite = (((int) ptr + 128) & ~127) - (int) ptr;
Also changed incorrect ~128 to ~127.
diff --git a/src/alloc.c b/src/alloc.c
index 96d63f53cf..6f70976c34 100644
--- a/src/alloc.c
+++ b/src/alloc.c
@@ -6399,7 +6399,7 @@ If this portion is smaller than `gc-cons-threshold', this is ignored. */);
Vgc_cons_percentage = make_float (0.1);
DEFVAR_INT ("pure-bytes-used", pure_bytes_used,
- doc: /* Number of bytes of sharable Lisp data allocated so far. */);
+ doc: /* Number of bytes of shareable Lisp data allocated so far. */);
DEFVAR_INT ("cons-cells-consed", cons_cells_consed,
doc: /* Number of cons cells that have been consed so far. */);
diff --git a/src/editfns.c b/src/editfns.c
index 83cd4bd553..7077f40e51 100644
--- a/src/editfns.c
+++ b/src/editfns.c
@@ -3870,7 +3870,7 @@ usage: (format STRING &rest OBJECTS) */)
enum
{
/* Maximum precision for a %f conversion such that the
- trailing output digit might be nonzero. Any precisions
+ trailing output digit might be nonzero. Any precision
larger than this will not yield useful information. */
USEFUL_PRECISION_MAX =
((1 - DBL_MIN_EXP)
diff --git a/src/emacs.c b/src/emacs.c
index 6bfc0dc60d..12a48b2655 100644
--- a/src/emacs.c
+++ b/src/emacs.c
@@ -951,7 +951,7 @@ main (int argc, char **argv)
}
/* Command line option --no-windows is deprecated and thus not mentioned
- in the manual and usage informations. */
+ in the manual and usage information. */
if (argmatch (argv, argc, "-nw", "--no-window-system", 6, NULL, &skip_args)
|| argmatch (argv, argc, "-nw", "--no-windows", 6, NULL, &skip_args))
inhibit_window_system = 1;
diff --git a/src/fontset.c b/src/fontset.c
index 605d807aa3..281ac92f82 100644
--- a/src/fontset.c
+++ b/src/fontset.c
@@ -643,7 +643,7 @@ fontset_find_font (Lisp_Object fontset, int c, struct face *face, int id, int fa
if (font_has_char (f, font_object, c))
goto found;
- /* Find a font already opened, maching with the current spec,
+ /* Find a font already opened, matching with the current spec,
and supporting C. */
font_def = RFONT_DEF_FONT_DEF (rfont_def);
for (; found_index + 1 < ASIZE (vec); found_index++)
diff --git a/src/ftfont.c b/src/ftfont.c
index bab97e44fa..dbb2ce2745 100644
--- a/src/ftfont.c
+++ b/src/ftfont.c
@@ -960,7 +960,7 @@ ftfont_list (Lisp_Object frame, Lisp_Object spec)
/* Need fix because this finds any fonts. */
if (fontset->nfont == 0 && ! NILP (family))
{
- /* Try maching with configuration. For instance, the
+ /* Try matching with configuration. For instance, the
configuration may specify "Nimbus Mono L" as an alias of
"Courier". */
FcPattern *pat = FcPatternBuild (0, FC_FAMILY, FcTypeString,
diff --git a/src/lastfile.c b/src/lastfile.c
index d348e4ebb0..ab07e74893 100644
--- a/src/lastfile.c
+++ b/src/lastfile.c
@@ -23,7 +23,7 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
The files of Emacs are written so as to have no initialized
data that can ever need to be altered except at the first startup.
- This is so that those words can be dumped as sharable text.
+ This is so that those words can be dumped as shareable text.
It is not possible to exercise such control over library files.
So it is necessary to refrain from making their data areas shared.
@@ -47,4 +47,3 @@ char my_endbss[1];
of the bss area used by Emacs. */
static char _my_endbss[1];
char * my_endbss_static = _my_endbss;
-
diff --git a/src/lread.c b/src/lread.c
index 582d8f4663..7c0b047578 100644
--- a/src/lread.c
+++ b/src/lread.c
@@ -2822,7 +2822,7 @@ read1 (register Lisp_Object readcharfun, int *pch, int first_in_list)
So we now use the same heuristic as for backquote: old-style
unquotes are only recognized when first on a list, and when
followed by a space.
- Because it's more difficult to peak 2 chars ahead, a new-style
+ Because it's more difficult to peek 2 chars ahead, a new-style
,@ can still not be used outside of a `, unless it's in the middle
of a list. */
if (new_backquote_flag
diff --git a/src/nsfont.m b/src/nsfont.m
index 7d691ced6e..6a053af344 100644
--- a/src/nsfont.m
+++ b/src/nsfont.m
@@ -630,7 +630,7 @@ nsfont_list (Lisp_Object frame, Lisp_Object font_spec)
}
-/* Return a font entity most closely maching with FONT_SPEC on
+/* Return a font entity most closely matching with FONT_SPEC on
FRAME. The closeness is determined by the font backend, thus
`face-font-selection-order' is ignored here.
Properties to be considered are same as for list(). */
diff --git a/src/region-cache.c b/src/region-cache.c
index ed7a07a670..054374eb68 100644
--- a/src/region-cache.c
+++ b/src/region-cache.c
@@ -699,7 +699,7 @@ know_region_cache (struct buffer *buf, struct region_cache *c,
/* Return true if the text immediately after POS in BUF is known, for
the purposes of CACHE. If NEXT is non-zero, set *NEXT to the nearest
- position after POS where the knownness changes. */
+ position after POS where the knowledge changes. */
int
region_cache_forward (struct buffer *buf, struct region_cache *c,
ptrdiff_t pos, ptrdiff_t *next)
@@ -736,7 +736,7 @@ region_cache_forward (struct buffer *buf, struct region_cache *c,
/* Return true if the text immediately before POS in BUF is known, for
the purposes of CACHE. If NEXT is non-zero, set *NEXT to the nearest
- position before POS where the knownness changes. */
+ position before POS where the knowledge changes. */
int region_cache_backward (struct buffer *buf, struct region_cache *c,
ptrdiff_t pos, ptrdiff_t *next)
{
diff --git a/src/region-cache.h b/src/region-cache.h
index 8e1be71677..6758f8bcd0 100644
--- a/src/region-cache.h
+++ b/src/region-cache.h
@@ -97,7 +97,7 @@ extern void invalidate_region_cache (struct buffer *BUF,
/* Return true if the text immediately after POS in BUF is known, for
the purposes of CACHE. If NEXT is non-zero, set *NEXT to the nearest
- position after POS where the knownness changes. */
+ position after POS where the knowledge changes. */
extern int region_cache_forward (struct buffer *BUF,
struct region_cache *CACHE,
ptrdiff_t POS,
@@ -105,7 +105,7 @@ extern int region_cache_forward (struct buffer *BUF,
/* Return true if the text immediately before POS in BUF is known, for
the purposes of CACHE. If NEXT is non-zero, set *NEXT to the nearest
- position before POS where the knownness changes. */
+ position before POS where the knowledge changes. */
extern int region_cache_backward (struct buffer *BUF,
struct region_cache *CACHE,
ptrdiff_t POS,
diff --git a/src/termhooks.h b/src/termhooks.h
index 63d166b641..5bd081d6d8 100644
--- a/src/termhooks.h
+++ b/src/termhooks.h
@@ -553,7 +553,7 @@ struct terminal
/* Arrange for all scroll bars on FRAME to be removed at the next call
to `*judge_scroll_bars_hook'. A scroll bar may be spared if
- `*redeem_scroll_bar_hook' is applied to its window before the judgement.
+ `*redeem_scroll_bar_hook' is applied to its window before the judgment.
This should be applied to each frame each time its window tree is
redisplayed, even if it is not displaying scroll bars at the moment;
@@ -565,7 +565,7 @@ struct terminal
currently displaying them. */
void (*condemn_scroll_bars_hook) (struct frame *frame);
- /* Unmark WINDOW's scroll bar for deletion in this judgement cycle.
+ /* Unmark WINDOW's scroll bar for deletion in this judgment cycle.
Note that it's okay to redeem a scroll bar that is not condemned. */
void (*redeem_scroll_bar_hook) (struct window *window);
diff --git a/src/xfns.c b/src/xfns.c
index 95154395e9..e44f28df87 100644
--- a/src/xfns.c
+++ b/src/xfns.c
@@ -1877,7 +1877,7 @@ static XIMStyle supported_xim_styles[] =
#if defined HAVE_X_WINDOWS && defined USE_X_TOOLKIT
/* Create an X fontset on frame F with base font name BASE_FONTNAME. */
-static const char xic_defaut_fontset[] = "-*-*-*-r-normal--14-*-*-*-*-*-*-*";
+static const char xic_default_fontset[] = "-*-*-*-r-normal--14-*-*-*-*-*-*-*";
/* Create an Xt fontset spec from the name of a base font.
If `motif' is True use the Motif syntax. */
@@ -1888,7 +1888,7 @@ xic_create_fontsetname (const char *base_fontname, int motif)
char *fontsetname;
/* Make a fontset name from the base font name. */
- if (xic_defaut_fontset == base_fontname)
+ if (xic_default_fontset == base_fontname)
{ /* There is no base font name, use the default. */
ptrdiff_t len = strlen (base_fontname) + 2;
fontsetname = xmalloc (len);
@@ -1912,12 +1912,12 @@ xic_create_fontsetname (const char *base_fontname, int motif)
modify it to generalize it to allcs and allfamilies.
Use the specified font plus the default. */
ptrdiff_t len =
- strlen (base_fontname) + strlen (xic_defaut_fontset) + 3;
+ strlen (base_fontname) + strlen (xic_default_fontset) + 3;
fontsetname = xmalloc (len);
memset (fontsetname, 0, len);
strcpy (fontsetname, base_fontname);
strcat (fontsetname, sep);
- strcat (fontsetname, xic_defaut_fontset);
+ strcat (fontsetname, xic_default_fontset);
}
else
{