Spelling fixes.

17 files changed, 26 insertions, 25 deletions

diff --git a/src/ChangeLog.10 b/src/ChangeLog.10
index 4c0590aa94b..42af99ccc58 100644
--- a/src/ChangeLog.10
+++ b/src/ChangeLog.10
@@ -23013,7 +23013,7 @@
         (try_window_id): Likewise.
         (redisplay_window): New local var buffer_unchanged_p.
 
-        * keyboard.c (cmd_error) [HAVE_X_WINDOWS]: Maybe call cancel_houglass.
+        * keyboard.c (cmd_error) [HAVE_X_WINDOWS]: Maybe call cancel_hourglass.
 
         * process.c (create_process): Test USG_SUBTTY_WORKS.
         (process_send_signal): Clean up handling of GID.
diff --git a/src/ChangeLog.11 b/src/ChangeLog.11
index 7c027f1caec..7c46dea675c 100644
--- a/src/ChangeLog.11
+++ b/src/ChangeLog.11
@@ -22234,7 +22234,7 @@
         * lisp.h (Fdelete_terminal): Declare.
 
         * charset.h (CHECK_CHARSET, CHECK_CHARSET_GET_ID)
-        (CHECK_CHARSET_GET_ATTR): Don't use the inexistent return value of
+        (CHECK_CHARSET_GET_ATTR): Don't use the nonexistent return value of
         wrong_type_argument.
 
 2008-02-22  Kenichi Handa  <handa@ni.aist.go.jp>
@@ -31330,7 +31330,7 @@
 
 2007-05-12  Chong Yidong  <cyd@stupidchicken.com>
 
-        * image.c (pbm_load): Correctly check image size for greyscale pbm.
+        * image.c (pbm_load): Correctly check image size for grayscale pbm.
 
         * xterm.c (XTread_socket): Yet Another Uncaught X Error Crash (YAUXEC).
 
diff --git a/src/ChangeLog.3 b/src/ChangeLog.3
index 493e8e1ab04..34906e505da 100644
--- a/src/ChangeLog.3
+++ b/src/ChangeLog.3
@@ -3271,7 +3271,7 @@
         [not HAVE_X11] (x_set_border_pixel): Use gray_width and
         gray_height, instead of assuming that the bitmap is 16x16.
         (x_make_gc): Instead of creating a pixmap and then calling
-        XPutImage to make it into a grey stipple, just call
+        XPutImage to make it into a gray stipple, just call
         XCreatePixmapFromBitmapData to do it all at once.
 
         * xterm.c (x_text_icon): Move the request for font information
diff --git a/src/ChangeLog.8 b/src/ChangeLog.8
index 4c9ecfb4d4d..2f3ee45a1ac 100644
--- a/src/ChangeLog.8
+++ b/src/ChangeLog.8
@@ -5409,7 +5409,7 @@
 
 1998-11-10  Gerd Moellmann  <gerd@gnu.org>
 
-        * xrdb.c (x_load_resources): Add grey background colors as
+        * xrdb.c (x_load_resources): Add gray background colors as
         defaults for menus, scroll bars, and dialogs.
 
         * insdel.c (prepare_to_modify_buffer): Move setting
diff --git a/src/buffer.c b/src/buffer.c
index f8482c351c5..a482493fac7 100644
--- a/src/buffer.c
+++ b/src/buffer.c
@@ -1631,7 +1631,7 @@ with SIGHUP.  */)
 
   /* Reset the local variables, so that this buffer's local values
      won't be protected from GC.  They would be protected
-     if they happened to remain encached in their symbols.
+     if they happened to remain cached in their symbols.
      This gets rid of them for certain.  */
   swap_out_buffer_local_variables (b);
   reset_buffer_local_variables (b, 1);
@@ -2486,7 +2486,7 @@ swap_out_buffer_local_variables (struct buffer *b)
       Lisp_Object sym = XCAR (XCAR (alist));
       eassert (XSYMBOL (sym)->redirect == SYMBOL_LOCALIZED);
       /* Need not do anything if some other buffer's binding is
-         now encached.  */
+         now cached.  */
       if (EQ (SYMBOL_BLV (XSYMBOL (sym))->where, buffer))
         {
           /* Symbol is set up for this buffer's old local value:
diff --git a/src/charset.c b/src/charset.c
index b6921a762b6..3c15f1bee54 100644
--- a/src/charset.c
+++ b/src/charset.c
@@ -166,9 +166,9 @@ static struct
      maximum character of the current charset.  */
   int min_char, max_char;
 
-  /* A Unicode character correspoinding to the code indice 0 (i.e. the
+  /* A Unicode character corresponding to the code index 0 (i.e. the
      minimum code-point) of the current charset, or -1 if the code
-     indice 0 is not a Unicode character.  This is checked when
+     index 0 is not a Unicode character.  This is checked when
      table.encoder[CHAR] is zero.  */
   int zero_index_char;
 
diff --git a/src/dispextern.h b/src/dispextern.h
index 3225c1eb46e..5228a71ba3f 100644
--- a/src/dispextern.h
+++ b/src/dispextern.h
@@ -405,7 +405,7 @@ struct glyph
   {
     /* Metrics of a partial glyph of an image (type == IMAGE_GLYPH).  */
     struct glyph_slice img;
-    /* Start and end indices of glyphs of a graphme cluster of a
+    /* Start and end indices of glyphs of a grapheme cluster of a
        composition (type == COMPOSITE_GLYPH).  */
     struct { int from, to; } cmp;
     /* Pixel offsets for upper and lower part of the acronym.  */
diff --git a/src/gtkutil.h b/src/gtkutil.h
index 2dfb3a5ed6c..7cc2d21f9c4 100644
--- a/src/gtkutil.h
+++ b/src/gtkutil.h
@@ -98,7 +98,7 @@ extern GtkWidget *xg_create_widget (const char *type,
                                     struct _widget_value *val,
                                     GCallback select_cb,
                                     GCallback deactivate_cb,
-                                    GCallback hightlight_cb);
+                                    GCallback highlight_cb);
 
 extern void xg_modify_menubar_widgets (GtkWidget *menubar,
                                        FRAME_PTR f,
@@ -106,7 +106,7 @@ extern void xg_modify_menubar_widgets (GtkWidget *menubar,
                                        int deep_p,
                                        GCallback select_cb,
                                        GCallback deactivate_cb,
-                                       GCallback hightlight_cb);
+                                       GCallback highlight_cb);
 
 extern int xg_update_frame_menubar (FRAME_PTR f);
 
diff --git a/src/lisp.h b/src/lisp.h
index dcd1167e0a2..fa41239a1c8 100644
--- a/src/lisp.h
+++ b/src/lisp.h
@@ -324,7 +324,7 @@ union Lisp_Object
 
     struct
       {
-        /* Use explict signed, the signedness of a bit-field of type
+        /* Use explicit signed, the signedness of a bit-field of type
            int is implementation defined.  */
         signed EMACS_INT val  : VALBITS;
         ENUM_BF (Lisp_Type) type : GCTYPEBITS;
@@ -349,7 +349,7 @@ union Lisp_Object
     struct
       {
         ENUM_BF (Lisp_Type) type : GCTYPEBITS;
-        /* Use explict signed, the signedness of a bit-field of type
+        /* Use explicit signed, the signedness of a bit-field of type
            int is implementation defined.  */
         signed EMACS_INT val  : VALBITS;
       } s;
diff --git a/src/lread.c b/src/lread.c
index f1f6f0cbd78..cdbd09d2f89 100644
--- a/src/lread.c
+++ b/src/lread.c
@@ -1917,7 +1917,7 @@ which is the input stream for reading characters.
 This function does not move point.  */)
   (Lisp_Object start, Lisp_Object end, Lisp_Object printflag, Lisp_Object read_function)
 {
-  /* FIXME: Do the eval-sexp-add-defvars danse!  */
+  /* FIXME: Do the eval-sexp-add-defvars dance!  */
   int count = SPECPDL_INDEX ();
   Lisp_Object tem, cbuf;
 
diff --git a/src/nsterm.m b/src/nsterm.m
index b02561442e5..5e19a397c34 100644
--- a/src/nsterm.m
+++ b/src/nsterm.m
@@ -559,7 +559,7 @@ ns_constrain_all_frames (void)
         {
           NSView *view = FRAME_NS_VIEW (f);
           /* This no-op will trigger the default window placing
-           * constriant system. */
+           * constraint system. */
           f->output_data.ns->dont_constrain = 0;
           [[view window] setFrameOrigin:[[view window] frame].origin];
         }
diff --git a/src/w32fns.c b/src/w32fns.c
index 96b3f69b728..7a17c108d4d 100644
--- a/src/w32fns.c
+++ b/src/w32fns.c
@@ -5011,7 +5011,8 @@ no value of TYPE (always string in the MS Windows case).  */)
    cursor.  Duplicated from xdisp.c, but cannot use the version there
    due to lack of atimers on w32.  */
 #define DEFAULT_HOURGLASS_DELAY 1
-/* Return non-zero if houglass timer has been started or hourglass is shown.  */
+/* Return non-zero if hourglass timer has been started or hourglass is
+   shown.  */
 /* PENDING: if W32 can use atimers (atimer.[hc]) then the common impl in
             xdisp.c could be used. */
 
diff --git a/src/widget.c b/src/widget.c
index 0582718948d..181811b8369 100644
--- a/src/widget.c
+++ b/src/widget.c
@@ -808,7 +808,7 @@ EmacsFrameQueryGeometry (Widget widget, XtWidgetGeometry *request, XtWidgetGeome
   return result->request_mode ? XtGeometryAlmost : XtGeometryYes;
 }
 
-/* Special entrypoints */
+/* Special entry points */
 void
 EmacsFrameSetCharSize (Widget widget, int columns, int rows)
 {
diff --git a/src/widget.h b/src/widget.h
index f64f188e158..b5b4147b167 100644
--- a/src/widget.h
+++ b/src/widget.h
@@ -92,9 +92,8 @@ extern WidgetClass emacsFrameClass;
 
 extern struct _DisplayContext* display_context;
 
-/* Special entrypoints */
+/* Special entry points */
 void EmacsFrameSetCharSize (Widget, int, int);
 void widget_store_internal_border (Widget widget);
 
 #endif /* _EmacsFrame_h */
-
diff --git a/src/window.c b/src/window.c
index bb2478d78fd..af4fad054a2 100644
--- a/src/window.c
+++ b/src/window.c
@@ -3088,7 +3088,7 @@ This function runs `window-scroll-functions' before running
             error ("Window is dedicated to `%s'", SDATA (BVAR (XBUFFER (tem), name)));
           else
             /* WINDOW is weakly dedicated to its buffer, reset
-               dedicatedness.  */
+               dedication.  */
             w->dedicated = Qnil;
 
           call1 (Qrecord_window_buffer, window);
@@ -6299,7 +6299,7 @@ freeze_window_starts (struct frame *f, int freeze_p)
    ignore_positions non-zero means ignore non-matching scroll positions
    and the like.
 
-   This ignores a couple of things like the dedicatedness status of
+   This ignores a couple of things like the dedication status of
    window, combination_limit and the like.  This might have to be
    fixed.  */
 
diff --git a/src/xdisp.c b/src/xdisp.c
index 921155940b5..c9b9b5c5e88 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -28662,7 +28662,8 @@ init_xdisp (void)
 
 /* Platform-independent portion of hourglass implementation. */
 
-/* Return non-zero if houglass timer has been started or hourglass is shown.  */
+/* Return non-zero if hourglass timer has been started or hourglass is
+   shown.  */
 int
 hourglass_started (void)
 {
diff --git a/src/xfaces.c b/src/xfaces.c
index 849ad6bbdf4..7e3ce4103d9 100644
--- a/src/xfaces.c
+++ b/src/xfaces.c
@@ -66,7 +66,7 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
    attributes (1st thru 5th) are updated from the spec.
 
    On the other hand, if one of the other font-related attributes are
-   specified, the correspoinding specs in this attribute is set to nil.
+   specified, the corresponding specs in this attribute is set to nil.
 
    15. A face name or list of face names from which to inherit attributes.
 
@@ -1223,7 +1223,7 @@ face_color_gray_p (struct frame *f, const char *color_name)
   int gray_p;
 
   if (defined_color (f, color_name, &color, 0))
-    gray_p = (/* Any color sufficiently close to black counts as grey.  */
+    gray_p = (/* Any color sufficiently close to black counts as gray.  */
               (color.red < 5000 && color.green < 5000 && color.blue < 5000)
               ||
               ((eabs (color.red - color.green)