Apply typo patches from Paul Eggert.

61 files changed, 109 insertions, 109 deletions

diff --git a/src/alloc.c b/src/alloc.c
index 56b59f5006d..f47287d4b01 100644
--- a/src/alloc.c
+++ b/src/alloc.c
@@ -359,7 +359,7 @@ mark_interval_tree (tree)
   { if (!NULL_INTERVAL_P (i)) mark_interval_tree (i); }
 
 /* The oddity in the call to XUNMARK is necessary because XUNMARK
-   expands to an assigment to its argument, and most C compilers don't
+   expands to an assignment to its argument, and most C compilers don't
    support casts on the left operand of `='.  */
 #define UNMARK_BALANCE_INTERVALS(i)                             \
 {                                                               \
@@ -1444,7 +1444,7 @@ clear_marks ()
   If the object referred to has not been seen yet, recursively mark
   all the references contained in it.
 
-   If the object referenced is a short string, the referrencing slot
+   If the object referenced is a short string, the referencing slot
    is threaded into a chain of such slots, pointed to from
    the `size' field of the string.  The actual string size
    lives in the last slot in the chain.  We recognize the end
diff --git a/src/buffer.c b/src/buffer.c
index 8a611fc7409..c08135b2e00 100644
--- a/src/buffer.c
+++ b/src/buffer.c
@@ -1709,7 +1709,7 @@ OVERLAY.")
 
 
 DEFUN ("overlays-at", Foverlays_at, Soverlays_at, 1, 1, 0,
-  "Return a list of the overays that contain position POS.")
+  "Return a list of the overlays that contain position POS.")
   (pos)
      Lisp_Object pos;
 {
diff --git a/src/cmds.c b/src/cmds.c
index f0dbf72cfcd..df8cd6d0645 100644
--- a/src/cmds.c
+++ b/src/cmds.c
@@ -244,7 +244,7 @@ In Auto Fill mode, if no numeric arg, break the preceding line if it's long.")
     Fbarf_if_buffer_read_only ();
 
   /* Inserting a newline at the end of a line produces better
-     redisplay in try_window_id than inserting at the ebginning fo a
+     redisplay in try_window_id than inserting at the beginning of a
      line, and the textual result is the same.  So, if we're at
      beginning of line, pretend to be at the end of the previous line.  
 
diff --git a/src/config.in b/src/config.in
index 89858d31daf..9fad42a74cc 100644
--- a/src/config.in
+++ b/src/config.in
@@ -201,7 +201,7 @@ and this notice must be preserved on all copies.  */
    programs assume that if you have a config.h file, you must declare
    the type of getenv.
 
-   This declaration shouldn't appear when alloca.s or ymakfile
+   This declaration shouldn't appear when alloca.s or ymakefile
    includes config.h.  */
 #ifndef NOT_C_CODE
 extern char *getenv ();
diff --git a/src/data.c b/src/data.c
index bdbead64df0..d9c905a6b0e 100644
--- a/src/data.c
+++ b/src/data.c
@@ -1215,9 +1215,9 @@ Lisp_Object
 indirect_function (object)
   register Lisp_Object object;
 {
-  Lisp_Object tortise, hare;
+  Lisp_Object tortoise, hare;
 
-  hare = tortise = object;
+  hare = tortoise = object;
 
   for (;;)
     {
@@ -1228,9 +1228,9 @@ indirect_function (object)
         break;
       hare = XSYMBOL (hare)->function;
 
-      tortise = XSYMBOL (tortise)->function;
+      tortoise = XSYMBOL (tortoise)->function;
 
-      if (EQ (hare, tortise))
+      if (EQ (hare, tortoise))
         Fsignal (Qcyclic_function_indirection, Fcons (object, Qnil));
     }
 
diff --git a/src/dired.c b/src/dired.c
index ee0ae07b970..4a529bc7503 100644
--- a/src/dired.c
+++ b/src/dired.c
@@ -551,7 +551,7 @@ If file does not exist, returns nil.")
   filemodestring (&s, modes);
   values[8] = make_string (modes, 10);
 #ifdef BSD4_3 /* Gross kludge to avoid lack of "#if defined(...)" in VMS */
-#define BSD4_2 /* A new meaning to the term `backwards compatability' */
+#define BSD4_2 /* A new meaning to the term `backwards compatibility' */
 #endif
 #ifdef BSD4_2                   /* file gid will be dir gid */
   dirname = Ffile_name_directory (filename);
diff --git a/src/dispnew.c b/src/dispnew.c
index 7bcd8015b2f..ed392e0eddf 100644
--- a/src/dispnew.c
+++ b/src/dispnew.c
@@ -116,7 +116,7 @@ FRAME_PTR last_nonminibuf_frame;
    exist inside frame objects lives in the following structure instead.
 
    NOTE: the_only_frame is not checked for garbage collection; don't
-   store collectable objects in any of its fields!
+   store collectible objects in any of its fields!
 
    You're not/The only frame in town/...  */
 
diff --git a/src/editfns.c b/src/editfns.c
index e8b2a08c79f..a68696ce9ec 100644
--- a/src/editfns.c
+++ b/src/editfns.c
@@ -795,7 +795,7 @@ Both arguments are required.")
 
 /* Return a Lisp_String containing the text of the current buffer from
    START to END.  If text properties are in use and the current buffer
-   has properties in the range specifed, the resulting string will also
+   has properties in the range specified, the resulting string will also
    have them.
 
    We don't want to use plain old make_string here, because it calls
@@ -1365,7 +1365,7 @@ Use %% to put a single % into the output.")
         else if (XTYPE (args[n]) == Lisp_Int && *format != 's')
           {
 #ifdef LISP_FLOAT_TYPE
-            /* The following loop issumes the Lisp type indicates
+            /* The following loop assumes the Lisp type indicates
                the proper way to pass the argument.
                So make sure we have a flonum if the argument should
                be a double.  */
diff --git a/src/floatfns.c b/src/floatfns.c
index abc873688e4..ca50a920f3c 100644
--- a/src/floatfns.c
+++ b/src/floatfns.c
@@ -405,8 +405,8 @@ DEFUN ("expt", Fexpt, Sexpt, 2, 2, 0,
   if ((XTYPE (arg1) == Lisp_Int) && /* common lisp spec */
       (XTYPE (arg2) == Lisp_Int)) /* don't promote, if both are ints */
     {                           /* this can be improved by pre-calculating */
-      int acc, x, y;            /* some binary powers of x then acumulating */
-      /* these, therby saving some time. -wsr */
+      int acc, x, y;            /* some binary powers of x then accumulating */
+      /* these, thereby saving some time. -wsr */
       x = XINT (arg1);
       y = XINT (arg2);
       acc = 1;
diff --git a/src/frame.c b/src/frame.c
index 952cc65f7ff..290fb18ee6b 100644
--- a/src/frame.c
+++ b/src/frame.c
@@ -326,7 +326,7 @@ make_terminal_frame ()
 
 DEFUN ("select-frame", Fselect_frame, Sselect_frame, 1, 2, "e",
   "Select the frame FRAME.\n\
-Subseqent editing commands apply to its selected window.\n\
+Subsequent editing commands apply to its selected window.\n\
 The selection of FRAME lasts until the next time the user does\n\
 something to select a different frame, or until the next time this\n\
 function is called.")
@@ -394,7 +394,7 @@ to that frame.")
   choose_minibuf_frame ();
 
   /* We want to make sure that the next event generates a frame-switch
-     event to the appropriate frame.  This seems kludgey to me, but
+     event to the appropriate frame.  This seems kludgy to me, but
      before you take it out, make sure that evaluating something like
      (select-window (frame-root-window (new-frame))) doesn't end up
      with your typing being interpreted in the new frame instead of
diff --git a/src/frame.h b/src/frame.h
index e658cdc9286..e56e7d27e68 100644
--- a/src/frame.h
+++ b/src/frame.h
@@ -87,7 +87,7 @@ struct frame
   /* Name of this frame: a Lisp string.  See also `explicit_name'.  */
   Lisp_Object name;
 
-  /* The frame which should recieve keystrokes that occur in this
+  /* The frame which should receive keystrokes that occur in this
      frame, or nil if they should go to the frame itself.  This is
      usually nil, but if the frame is minibufferless, we can use this
      to redirect keystrokes to a surrogate minibuffer frame when
diff --git a/src/hftctl.c b/src/hftctl.c
index 7f6cc919495..5891b25cd2e 100644
--- a/src/hftctl.c
+++ b/src/hftctl.c
@@ -20,7 +20,7 @@
 /*      2. places fildes into raw mode                         */
 /*      3. converts ioctl arguments to datastream              */
 /*      4. waits for 2 secs for acknowledgement before         */
-/*         timimg out.                                         */
+/*         timing out.                                         */
 /*      5. places response in callers buffer ( just like       */
 /*         ioctl.                                              */
 /*      6. returns fildes to its original mode                 */
diff --git a/src/insdel.c b/src/insdel.c
index 9d2572bfe62..f53d6a76c6a 100644
--- a/src/insdel.c
+++ b/src/insdel.c
@@ -546,7 +546,7 @@ after_change_function_restore (value)
   Vafter_change_function = value;
 }
 
-/* Signal a change to the buffer immediatly before it happens.
+/* Signal a change to the buffer immediately before it happens.
    START and END are the bounds of the text to be changed,
    as Lisp objects.  */
 
@@ -578,7 +578,7 @@ signal_before_change (start, end)
     }
 }
 
-/* Signal a change immediatly after it happens.
+/* Signal a change immediately after it happens.
    POS is the address of the start of the changed text.
    LENDEL is the number of characters of the text before the change.
    (Not the whole buffer; just the part that was changed.)
diff --git a/src/intervals.c b/src/intervals.c
index c4bb4c381db..7809c37505b 100644
--- a/src/intervals.c
+++ b/src/intervals.c
@@ -837,7 +837,7 @@ interval_deletion_adjustment (tree, from, amount)
   /* Never reach here */
 }
 
-/* Effect the adjustments neccessary to the interval tree of BUFFER
+/* Effect the adjustments necessary to the interval tree of BUFFER
    to correspond to the deletion of LENGTH characters from that buffer
    text.  The deletion is effected at position START (relative to the
    buffer). */
@@ -881,7 +881,7 @@ adjust_intervals_for_deletion (buffer, start, length)
     }
 }
 
-/* Make the adjustments neccessary to the interval tree of BUFFER to
+/* Make the adjustments necessary to the interval tree of BUFFER to
    represent an addition or deletion of LENGTH characters starting
    at position START.  Addition or deletion is indicated by the sign
    of LENGTH. */
@@ -1096,7 +1096,7 @@ make_new_interval (intervals, start, length)
    had its appropriate sticky property set (front_sticky, rear_sticky),
    the new text has only its properties.  If one of the sticky properties
    is set, then the new text "sticks" to that region and its properties
-   depend on merging as above.  If both the preceding and succeding
+   depend on merging as above.  If both the preceding and succeeding
    intervals to the new text are "sticky", then the new text retains
    only its properties, as if neither sticky property were set.  Perhaps
    we should consider merging all three sets of properties onto the new
diff --git a/src/keyboard.c b/src/keyboard.c
index fb935e7bb8f..c192b2070bd 100644
--- a/src/keyboard.c
+++ b/src/keyboard.c
@@ -903,7 +903,7 @@ command_loop_1 ()
       Vdeactivate_mark = Qnil;
 
       /* If minibuffer on and echo area in use,
-         wait 2 sec and redraw minibufer.  */
+         wait 2 sec and redraw minibuffer.  */
 
       if (minibuf_level && echo_area_glyphs)
         {
@@ -1175,7 +1175,7 @@ command_loop_1 ()
 /* Number of seconds between polling for input.  */
 int polling_period;
 
-/* Nonzero means polling for input is temporarily suppresed.  */
+/* Nonzero means polling for input is temporarily suppressed.  */
 int poll_suppress_count;
 
 #ifdef POLL_FOR_INPUT
@@ -1333,7 +1333,7 @@ read_char (commandflag, nmaps, maps, prev_event, used_mouse_menu)
          remain unchanged.
 
          Since this event came from a macro, it would be misleading to
-         leave internal_last_event_frame set to whereever the last
+         leave internal_last_event_frame set to wherever the last
          real event came from.  Normally, a switch-frame event selects
          internal_last_event_frame after each command is read, but
          events read from a macro should never cause a new frame to be
@@ -2753,7 +2753,7 @@ reorder_modifiers (symbol)
    the returned symbol. 
 
    The symbols we create are supposed to have an
-   `event-symbol-elements' propery, which lists the modifiers present
+   `event-symbol-elements' property, which lists the modifiers present
    in the symbol's name.  */
 
 static Lisp_Object
@@ -3801,7 +3801,7 @@ read_key_sequence (keybuf, bufsize, prompt)
                          use save_excursion_{save,restore} here, because they
                          save point as well as the current buffer; we don't
                          want to save point, because redisplay may change it,
-                         to accomodate a Fset_window_start or something.  We
+                         to accommodate a Fset_window_start or something.  We
                          don't want to do this at the top of the function,
                          because we may get input from a subprocess which
                          wants to change the selected window and stuff (say,
@@ -4417,7 +4417,7 @@ On such systems, Emacs starts a subshell instead of suspending.")
 }
 
 /* If STUFFSTRING is a string, stuff its contents as pending terminal input.
-   Then in any case stuff anthing Emacs has read ahead and not used.  */
+   Then in any case stuff anything Emacs has read ahead and not used.  */
 
 stuff_buffered_input (stuffstring)
      Lisp_Object stuffstring;
diff --git a/src/keyboard.h b/src/keyboard.h
index ccb05ce3071..fb9f8b64de6 100644
--- a/src/keyboard.h
+++ b/src/keyboard.h
@@ -23,7 +23,7 @@ extern int num_input_chars;
 /* Total number of times read_char has returned, outside of macros.  */
 extern int num_nonmacro_input_chars;
 
-/* Nonzero means polling for input is temporarily suppresed.  */
+/* Nonzero means polling for input is temporarily suppressed.  */
 extern int poll_suppress_count;
 
 /* Keymap mapping ASCII function key sequences onto their preferred forms.
diff --git a/src/lisp.h b/src/lisp.h
index 66b85c7679d..b7f5e0e20b2 100644
--- a/src/lisp.h
+++ b/src/lisp.h
@@ -474,7 +474,7 @@ typedef struct interval *INTERVAL;
    structures.  See, e.g., struct Lisp_String below. */
 #define DECLARE_INTERVALS INTERVAL intervals;
 
-/* Macro used to condionally compile interval initialization into
+/* Macro used to conditionally compile interval initialization into
    certain code.  See, e.g., alloc.c. */
 #define INITIALIZE_INTERVAL(ptr,val) ptr->intervals = val
 
diff --git a/src/m/att3b.h b/src/m/att3b.h
index 53fc26780af..838a5b867b3 100644
--- a/src/m/att3b.h
+++ b/src/m/att3b.h
@@ -129,7 +129,7 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
                  ? (sign_extend_temp | 0xFF000000) \
                  : (sign_extend_temp & 0x00FFFFFF))
 
-#ifdef emacs /* Don't do this when makeing xmakefile! */
+#ifdef emacs /* Don't do this when making xmakefile! */
 extern int sign_extend_temp;
 #endif
 
diff --git a/src/m/hp9000s300.h b/src/m/hp9000s300.h
index 6d247d34806..eaf7436a545 100644
--- a/src/m/hp9000s300.h
+++ b/src/m/hp9000s300.h
@@ -119,7 +119,7 @@ NOTE-END */
 
 /* #define VIRT_ADDR_VARIES */
 
-/* For University of Utah 4.3bsd implemetation on HP300s.
+/* For University of Utah 4.3bsd implementation on HP300s.
    The #ifndef __GNUC__ definitions are required for the "standard" cc,
    a very old, brain-dead version of PCC. */
 
diff --git a/src/m/ns32000.h b/src/m/ns32000.h
index 0520b678d75..f41e457dbe2 100644
--- a/src/m/ns32000.h
+++ b/src/m/ns32000.h
@@ -1,4 +1,4 @@
-/* machine description file for Netional Semiconductor 32000, running Genix.
+/* machine description file for National Semiconductor 32000, running Genix.
    Copyright (C) 1985, 1986 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
diff --git a/src/m/sps7.h b/src/m/sps7.h
index 5e838592cc6..0408ed0e02e 100644
--- a/src/m/sps7.h
+++ b/src/m/sps7.h
@@ -52,7 +52,7 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
 #define EXPLICIT_SIGN_EXTEND
 
 /* Data type of load average, as read out of kmem.  */
-/* Suspect there is something wierd about this machine, so turn it off.  */
+/* Suspect there is something weird about this machine, so turn it off.  */
 
 /* #define LOAD_AVE_TYPE long */
 
diff --git a/src/m/sun1.h b/src/m/sun1.h
index 085834ccb57..f4dca832daf 100644
--- a/src/m/sun1.h
+++ b/src/m/sun1.h
@@ -59,7 +59,7 @@ NOTE-END  */
 
 #define NO_UNION_TYPE
 
-/* Sun can't write competant compilers */
+/* Sun can't write competent compilers */
 #define COMPILER_REGISTER_BUG
 
 /* XINT must explicitly sign-extend */
diff --git a/src/print.c b/src/print.c
index 6075ea22210..3336a565b1d 100644
--- a/src/print.c
+++ b/src/print.c
@@ -128,7 +128,7 @@ glyph_to_str_cpy (glyphs, str)
 }
 #endif
 
-/* Low level output routines for charaters and strings */
+/* Low level output routines for characters and strings */
 
 /* Lisp functions to do output using a stream
  must have the stream in a variable called printcharfun
diff --git a/src/process.c b/src/process.c
index 91e411eff65..d0beafe6ad9 100644
--- a/src/process.c
+++ b/src/process.c
@@ -1683,7 +1683,7 @@ static int waiting_for_user_input_p;
    If read_kbd is a pointer to a struct Lisp_Process, then the
      function returns true iff we received input from that process
      before the timeout elapsed.
-   Otherwise, return true iff we recieved input from any process.  */
+   Otherwise, return true iff we received input from any process.  */
 
 wait_reading_process_input (time_limit, microsecs, read_kbd, do_display)
      int time_limit, microsecs;
@@ -3121,7 +3121,7 @@ extern int frame_garbaged;
    do_display != 0 means redisplay should be done to show subprocess
    output that arrives.  This version of the function ignores it.
 
-   Return true iff we recieved input from any process.  */
+   Return true iff we received input from any process.  */
 
 int
 wait_reading_process_input (time_limit, microsecs, read_kbd, do_display)
diff --git a/src/ralloc.c b/src/ralloc.c
index b33e329753d..6c52b83958e 100644
--- a/src/ralloc.c
+++ b/src/ralloc.c
@@ -19,7 +19,7 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
 
 /* NOTES:
 
-   Only relocate the blocs neccessary for SIZE in r_alloc_sbrk,
+   Only relocate the blocs necessary for SIZE in r_alloc_sbrk,
    rather than all of them.  This means allowing for a possible
    hole between the first bloc and the end of malloc storage. */
 
@@ -485,7 +485,7 @@ r_re_alloc (ptr, size)
    from the system.  */
 extern POINTER (*__morecore) ();
 
-/* Intialize various things for memory allocation. */
+/* Initialize various things for memory allocation. */
 
 static void
 r_alloc_init ()
diff --git a/src/s/aix3-1.h b/src/s/aix3-1.h
index f75518675d6..d7e20a4eaf2 100644
--- a/src/s/aix3-1.h
+++ b/src/s/aix3-1.h
@@ -180,7 +180,7 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
 #define _setjmp setjmp
 #define _longjmp longjmp
 
-/* On USG systems the system calls are interruptable by signals
+/* On USG systems the system calls are interruptible by signals
  that the user program has elected to catch.  Thus the system call
  must be retried in these cases.  To handle this without massive
  changes in the source code, we remap the standard system call names
diff --git a/src/s/dgux.h b/src/s/dgux.h
index 65530877c43..2e6ac7a08a0 100644
--- a/src/s/dgux.h
+++ b/src/s/dgux.h
@@ -52,7 +52,7 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
    Define INTERRUPT_INPUT to make interrupt_input = 1 the default (use SIGIO)
 
    SIGIO can be used only on systems that implement it (4.2 and 4.3).
-   CBREAK mode has two disadvatages
+   CBREAK mode has two disadvantages
      1) At least in 4.2, it is impossible to handle the Meta key properly.
         I hear that in system V this problem does not exist.
      2) Control-G causes output to be discarded.
diff --git a/src/s/gnu-linux.h b/src/s/gnu-linux.h
index ddedcc3cb0b..1499d819466 100644
--- a/src/s/gnu-linux.h
+++ b/src/s/gnu-linux.h
@@ -42,7 +42,7 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
    Define INTERRUPT_INPUT to make interrupt_input = 1 the default (use SIGIO)
 
    SIGIO can be used only on systems that implement it (4.2 and 4.3).
-   CBREAK mode has two disadvatages
+   CBREAK mode has two disadvantages
      1) At least in 4.2, it is impossible to handle the Meta key properly.
         I hear that in system V this problem does not exist.
      2) Control-G causes output to be discarded.
diff --git a/src/s/hpux.h b/src/s/hpux.h
index cd15e1ce13d..03dd1836187 100644
--- a/src/s/hpux.h
+++ b/src/s/hpux.h
@@ -98,7 +98,7 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
 /* #define NONSYSTEM_DIR_LIBRARY */
 
 /* Define this symbol if your system has the functions bcopy, etc.
- * s800 and later versions of s300 (s200) kernels have equivilents
+ * s800 and later versions of s300 (s200) kernels have equivalents
  * of the BSTRING functions of BSD.  If your s200 kernel doesn't have
  * em comment out this section.
  */
@@ -176,7 +176,7 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
 #define _longjmp longjmp
 */
 
-/* On USG systems the system calls are interruptable by signals
+/* On USG systems the system calls are interruptible by signals
  that the user program has elected to catch.  Thus the system call
  must be retried in these cases.  To handle this without massive
  changes in the source code, we remap the standard system call names
diff --git a/src/s/iris3-5.h b/src/s/iris3-5.h
index 20a36caa32a..3b175fa5506 100644
--- a/src/s/iris3-5.h
+++ b/src/s/iris3-5.h
@@ -154,7 +154,7 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
 #define _setjmp setjmp
 #define _longjmp longjmp
 
-/* On USG systems the system calls are interruptable by signals
+/* On USG systems the system calls are interruptible by signals
  that the user program has elected to catch.  Thus the system call
  must be retried in these cases.  To handle this without massive
  changes in the source code, we remap the standard system call names
diff --git a/src/s/iris3-6.h b/src/s/iris3-6.h
index 2944a70725b..a385d8623f8 100644
--- a/src/s/iris3-6.h
+++ b/src/s/iris3-6.h
@@ -155,7 +155,7 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
 #define _setjmp setjmp
 #define _longjmp longjmp
 
-/* On USG systems the system calls are interruptable by signals
+/* On USG systems the system calls are interruptible by signals
  that the user program has elected to catch.  Thus the system call
  must be retried in these cases.  To handle this without massive
  changes in the source code, we remap the standard system call names
diff --git a/src/s/irix3-3.h b/src/s/irix3-3.h
index 86a555e9e8c..252fc3a7b19 100644
--- a/src/s/irix3-3.h
+++ b/src/s/irix3-3.h
@@ -141,7 +141,7 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
 #define _setjmp setjmp
 #define _longjmp longjmp
 
-/* On USG systems the system calls are interruptable by signals
+/* On USG systems the system calls are interruptible by signals
  that the user program has elected to catch.  Thus the system call
  must be retried in these cases.  To handle this without massive
  changes in the source code, we remap the standard system call names
diff --git a/src/s/osf1.h b/src/s/osf1.h
index 491b8978a6f..10b8f078906 100644
--- a/src/s/osf1.h
+++ b/src/s/osf1.h
@@ -4,7 +4,7 @@
 
 #define OSF1
 
-/* Define _BSD to tell the inlcude files we're running under
+/* Define _BSD to tell the include files we're running under
    the BSD universe and not the SYSV universe.  */
 
 #define C_SWITCH_SYSTEM -D_BSD
diff --git a/src/s/rtu.h b/src/s/rtu.h
index b90ad6dd91d..f2ef555d1f1 100644
--- a/src/s/rtu.h
+++ b/src/s/rtu.h
@@ -44,7 +44,7 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
    Define INTERRUPT_INPUT to make interrupt_input = 1 the default (use SIGIO)
 
    SIGIO can be used only on systems that implement it (4.2 and 4.3).
-   CBREAK mode has two disadvatages
+   CBREAK mode has two disadvantages
      1) At least in 4.2, it is impossible to handle the Meta key properly.
         I hear that in system V this problem does not exist.
      2) Control-G causes output to be discarded.
@@ -139,7 +139,7 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
 
 /* Special hacks needed to make Emacs run on this system.  */
 
-/* On RTU systems (like USG) the system calls are interruptable by signals
+/* On RTU systems (like USG) the system calls are interruptible by signals
  that the user program has elected to catch.  Thus the system call
  must be retried in these cases.  To handle this without massive
  changes in the source code, we remap the standard system call names
diff --git a/src/s/sunos4-1.h b/src/s/sunos4-1.h
index 8e038a8c60d..61885d747c6 100644
--- a/src/s/sunos4-1.h
+++ b/src/s/sunos4-1.h
@@ -1,6 +1,6 @@
 #include "sunos4-0.h"
 
-/* 4.1.1 makes these system calls interruptable.  */
+/* 4.1.1 makes these system calls interruptible.  */
 
 #define read sys_read
 #define write sys_write
diff --git a/src/s/template.h b/src/s/template.h
index 62eb065dc36..3cee20afff6 100644
--- a/src/s/template.h
+++ b/src/s/template.h
@@ -58,7 +58,7 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
    INTERRUPT_INPUT to decide whether to use it by default.
 
    SIGIO can be used only on systems that implement it (4.2 and 4.3).
-   CBREAK mode has two disadvatages
+   CBREAK mode has two disadvantages
      1) At least in 4.2, it is impossible to handle the Meta key properly.
         I hear that in system V this problem does not exist.
      2) Control-G causes output to be discarded.
@@ -83,7 +83,7 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
  *      Define HAVE_TERMIO if the system provides sysV-style ioctls
  *      for terminal control.
  *
- *      Do not define both.  HAVE_TERMIOS is prefered, if it is
+ *      Do not define both.  HAVE_TERMIOS is preferred, if it is
  *      supported on your system.
  */
 
diff --git a/src/s/umax.h b/src/s/umax.h
index a67f15c22e1..2bbd333d7d0 100644
--- a/src/s/umax.h
+++ b/src/s/umax.h
@@ -51,7 +51,7 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
    Define INTERRUPT_INPUT to make interrupt_input = 1 the default (use SIGIO)
 
    SIGIO can be used only on systems that implement it (4.2 and 4.3).
-   CBREAK mode has two disadvatages
+   CBREAK mode has two disadvantages
      1) At least in 4.2, it is impossible to handle the Meta key properly.
         I hear that in system V this problem does not exist.
      2) Control-G causes output to be discarded.
diff --git a/src/s/unipl5-0.h b/src/s/unipl5-0.h
index 3df79561fb4..9cf3652fb94 100644
--- a/src/s/unipl5-0.h
+++ b/src/s/unipl5-0.h
@@ -160,7 +160,7 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
 #define _setjmp setjmp
 #define _longjmp longjmp
 
-/* On USG systems the system calls are interruptable by signals
+/* On USG systems the system calls are interruptible by signals
  that the user program has elected to catch.  Thus the system call
  must be retried in these cases.  To handle this without massive
  changes in the source code, we remap the standard system call names
diff --git a/src/s/unipl5-2.h b/src/s/unipl5-2.h
index 6850f8d55c9..f9e3979b92a 100644
--- a/src/s/unipl5-2.h
+++ b/src/s/unipl5-2.h
@@ -154,7 +154,7 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
 #define _setjmp setjmp
 #define _longjmp longjmp
 
-/* On USG systems the system calls are interruptable by signals
+/* On USG systems the system calls are interruptible by signals
  that the user program has elected to catch.  Thus the system call
  must be retried in these cases.  To handle this without massive
  changes in the source code, we remap the standard system call names
diff --git a/src/s/usg5-0.h b/src/s/usg5-0.h
index 16271c8a4f3..a6eeb26342d 100644
--- a/src/s/usg5-0.h
+++ b/src/s/usg5-0.h
@@ -149,7 +149,7 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
 #define _setjmp setjmp
 #define _longjmp longjmp
 
-/* On USG systems the system calls are interruptable by signals
+/* On USG systems the system calls are interruptible by signals
  that the user program has elected to catch.  Thus the system call
  must be retried in these cases.  To handle this without massive
  changes in the source code, we remap the standard system call names
diff --git a/src/s/usg5-2-2.h b/src/s/usg5-2-2.h
index 982f3e32107..3227700c100 100644
--- a/src/s/usg5-2-2.h
+++ b/src/s/usg5-2-2.h
@@ -148,7 +148,7 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
 #define _setjmp setjmp
 #define _longjmp longjmp
 
-/* On USG systems the system calls are interruptable by signals
+/* On USG systems the system calls are interruptible by signals
  that the user program has elected to catch.  Thus the system call
  must be retried in these cases.  To handle this without massive
  changes in the source code, we remap the standard system call names
diff --git a/src/s/usg5-2.h b/src/s/usg5-2.h
index 46346005dfb..d4a82ab6d0c 100644
--- a/src/s/usg5-2.h
+++ b/src/s/usg5-2.h
@@ -148,7 +148,7 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
 #define _setjmp setjmp
 #define _longjmp longjmp
 
-/* On USG systems the system calls are interruptable by signals
+/* On USG systems the system calls are interruptible by signals
  that the user program has elected to catch.  Thus the system call
  must be retried in these cases.  To handle this without massive
  changes in the source code, we remap the standard system call names
diff --git a/src/s/xenix.h b/src/s/xenix.h
index 83d48a1b56e..3560e172c62 100644
--- a/src/s/xenix.h
+++ b/src/s/xenix.h
@@ -51,7 +51,7 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
    Define INTERRUPT_INPUT to make interrupt_input = 1 the default (use SIGIO)
 
    SIGIO can be used only on systems that implement it (4.2 and 4.3).
-   CBREAK mode has two disadvatages
+   CBREAK mode has two disadvantages:
      1) At least in 4.2, it is impossible to handle the Meta key properly.
         I hear that in system V this problem does not exist.
      2) Control-G causes output to be discarded.
@@ -180,7 +180,7 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
 #define _setjmp setjmp
 #define _longjmp longjmp
 
-/* On USG systems the system calls are interruptable by signals
+/* On USG systems the system calls are interruptible by signals
  that the user program has elected to catch.  Thus the system call
  must be retried in these cases.  To handle this without massive
  changes in the source code, we remap the standard system call names
diff --git a/src/search.c b/src/search.c
index 99e3c40f58a..d9c4554cb92 100644
--- a/src/search.c
+++ b/src/search.c
@@ -943,7 +943,7 @@ search_buffer (string, pos, lim, n, RE, trt, inverse_trt)
                   while ((limit - pos) * direction >= 0)
                     pos += BM_tab[FETCH_CHAR(pos)];
                   /* now run the same tests to distinguish going off the */
-                  /* end, a match or a phoney match. */
+                  /* end, a match or a phony match. */
                   if ((pos - limit) * direction <= len)
                     break;      /* ran off the end */
                   /* Found what might be a match.
diff --git a/src/sunfns.c b/src/sunfns.c
index 5fcf6f6cf0b..45c0d6deb90 100644
--- a/src/sunfns.c
+++ b/src/sunfns.c
@@ -85,7 +85,7 @@ static mpr_static(ArrowCursorMpr, 16, 16, 1, ArrowCursorData);
 struct cursor DefaultCursor = {15, 0, PIX_SRC ^ PIX_DST, &ArrowCursorMpr};
 
 #else
-/* The default left-arror cursor, with XOR drawing. */
+/* The default left-arrow cursor, with XOR drawing. */
 static short ArrowCursorData[16] = {
         0x8000,0xC000,0xE000,0xF000,0xF800,0xFC00,0xFE00,0xF000,
         0xD800,0x9800,0x0C00,0x0C00,0x0600,0x0600,0x0300,0x0300};
@@ -291,7 +291,7 @@ sel_read (sel, file)
     return(-1);
   }
   /*
-   * The shelltool select saves newlines as carrige returns,
+   * The shelltool select saves newlines as carriage returns,
    * but emacs wants newlines.
    */
   for (i = 0; i < n; i++) 
diff --git a/src/syntax.c b/src/syntax.c
index 9b711327448..db60b8f09f5 100644
--- a/src/syntax.c
+++ b/src/syntax.c
@@ -774,7 +774,7 @@ between them, return t; otherwise return nil.")
                       }
 
                     /* If we find another earlier comment-ender,
-                       any comment-starts earier than that don't count
+                       any comment-starts earlier than that don't count
                        (because they go with the earlier comment-ender).  */
                     if (code == Sendcomment
                         && SYNTAX_COMMENT_STYLE (FETCH_CHAR (from)) == comstyle)
@@ -1161,7 +1161,7 @@ scan_lists (from, count, depth, sexpflag)
                       }
 
                     /* If we find another earlier comment-ender,
-                       any comment-starts earier than that don't count
+                       any comment-starts earlier than that don't count
                        (because they go with the earlier comment-ender).  */
                     if (code == Sendcomment
                         && SYNTAX_COMMENT_STYLE (FETCH_CHAR (from)) == comstyle)
diff --git a/src/sysdep.c b/src/sysdep.c
index 982d361ae2a..b7aa5d4bf0e 100644
--- a/src/sysdep.c
+++ b/src/sysdep.c
@@ -437,7 +437,7 @@ child_setup_tty (out)
   s.main.c_oflag &= ~OLCUC;     /* Disable map of lower case to upper on
                                    output */
 #if 0
-  /* Said to be unnecesary:  */
+  /* Said to be unnecessary:  */
   s.main.c_cc[VMIN] = 1;        /* minimum number of characters to accept  */
   s.main.c_cc[VTIME] = 0;       /* wait forever for at least 1 character  */
 #endif
@@ -697,7 +697,7 @@ reset_sigio ()
   unrequest_sigio ();
 }
 
-#ifdef FASYNC           /* F_SETFL does not imply existance of FASYNC */
+#ifdef FASYNC           /* F_SETFL does not imply existence of FASYNC */
 
 request_sigio ()
 {
@@ -830,7 +830,7 @@ emacs_set_tty (fd, settings, waitp)
      of the requested actions could not be performed.
      We must read settings back to ensure tty setup properly.
      AIX requires this to keep tty from hanging occasionally."  */
-  /* This make sure that we dont loop indefinetly in here.  */
+  /* This make sure that we don't loop indefinitely in here.  */
   for (i = 0 ; i < 10 ; i++)
     if (tcsetattr (fd, waitp ? TCSAFLUSH : TCSADRAIN, &settings->main) < 0)
       {
@@ -1162,7 +1162,7 @@ init_sys_modes ()
     }
 
 #ifdef F_SETFL
-#ifdef F_GETOWN         /* F_SETFL does not imply existance of F_GETOWN */
+#ifdef F_GETOWN         /* F_SETFL does not imply existence of F_GETOWN */
   if (interrupt_input)
     {
       old_fcntl_owner = fcntl (0, F_GETOWN, 0);
@@ -1311,7 +1311,7 @@ reset_sys_modes ()
 #endif
 
 #ifdef F_SETFL
-#ifdef F_SETOWN         /* F_SETFL does not imply existance of F_SETOWN */
+#ifdef F_SETOWN         /* F_SETFL does not imply existence of F_SETOWN */
   if (interrupt_input)
     {
       reset_sigio ();
@@ -2395,7 +2395,7 @@ sys_abort ()
 #ifdef VMS
 #ifdef LINK_CRTL_SHARE
 #ifdef SHAREABLE_LIB_BUG
-/* Variables declared noshare and initialized in shareable libraries
+/* Variables declared noshare and initialized in sharable libraries
    cannot be shared.  The VMS linker incorrectly forces you to use a private
    version which is uninitialized... If not for this "feature", we
    could use the C library definition of sys_nerr and sys_errlist. */
@@ -2516,7 +2516,7 @@ sys_write (fildes, buf, nbyte)
  *      to names for our own functions in sysdep.c that do the system call
  *      with retries.  Actually, for portability reasons, it is good
  *      programming practice, as this example shows, to limit all actual
- *      system calls to a single occurance in the source.  Sure, this
+ *      system calls to a single occurrence in the source.  Sure, this
  *      adds an extra level of function call overhead but it is almost
  *      always negligible.   Fred Fish, Unisoft Systems Inc.
  */
@@ -2802,7 +2802,7 @@ char *sys_siglist[NSIG + 1] =
   "power-fail restart",                  /* 19 SIGPWR    */
   "window size changed",                 /* 20 SIGWINCH  */
   "undefined",                           /* 21           */
-  "pollable event occured",              /* 22 SIGPOLL   */
+  "pollable event occurred",             /* 22 SIGPOLL   */
   "sendable stop signal not from tty",   /* 23 SIGSTOP   */
   "stop signal from tty",                /* 24 SIGSTP    */
   "continue a stopped process",          /* 25 SIGCONT   */
@@ -3574,7 +3574,7 @@ creat_copy_attrs (old, new)
 sys_creat (va_alist)
      va_dcl
 {
-  va_list list_incrementor;
+  va_list list_incrementer;
   char *name;
   int mode;
   int rfd;                      /* related file descriptor */
@@ -3588,12 +3588,12 @@ sys_creat (va_alist)
   extern int vms_stmlf_recfm;
 
   va_count (count);
-  va_start (list_incrementor);
-  name = va_arg (list_incrementor, char *);
-  mode = va_arg (list_incrementor, int);
+  va_start (list_incrementer);
+  name = va_arg (list_incrementer, char *);
+  mode = va_arg (list_incrementer, int);
   if (count > 2)
-    rfd = va_arg (list_incrementor, int);
-  va_end (list_incrementor);
+    rfd = va_arg (list_incrementer, int);
+  va_end (list_incrementer);
   if (count > 2)
     {
       /* Use information from the related file descriptor to set record
@@ -4102,7 +4102,7 @@ rename (from, to)
    are renaming.
 
    We could use the chmod function, but Eunichs uses 3 bits per user category
-   to describe the protection, and VMS uses 4 (write and delete are seperate
+   to describe the protection, and VMS uses 4 (write and delete are separate
    bits).  To maintain portability, the VMS implementation of `chmod' wires
    the W and D bits together.  */
 
diff --git a/src/systty.h b/src/systty.h
index 1324286c7fb..b07bfa27860 100644
--- a/src/systty.h
+++ b/src/systty.h
@@ -164,7 +164,7 @@ static struct sensemode {
 #undef ASYNC
 #endif
 
-/* Interupt input is not used if there is no FIONREAD.  */
+/* Interrupt input is not used if there is no FIONREAD.  */
 #ifndef FIONREAD
 #undef SIGIO
 #endif
diff --git a/src/term.c b/src/term.c
index 911f9f1feee..e84ab1c3c9e 100644
--- a/src/term.c
+++ b/src/term.c
@@ -40,7 +40,7 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
 #define OUTPUT_IF(a) { if (a) tputs (a, FRAME_HEIGHT (selected_frame) - curY, cmputc); }
 #define OUTPUT1_IF(a) { if (a) tputs (a, 1, cmputc); }
 
-/* Terminal charateristics that higher levels want to look at.
+/* Terminal characteristics that higher levels want to look at.
    These are all extern'd in termchar.h */
 
 int must_write_spaces;          /* Nonzero means spaces in the text
@@ -1255,7 +1255,7 @@ term_get_fkeys (address)
 
   /* The uses of the "k0" capability are inconsistent; sometimes it
      describes F10, whereas othertimes it describes F0 and "k;" describes F10.
-     We will attempt to politely accomodate both systems by testing for
+     We will attempt to politely accommodate both systems by testing for
      "k;", and if it is present, assuming that "k0" denotes F0, otherwise F10.
      */
   {
diff --git a/src/termopts.h b/src/termopts.h
index 489b786b248..d462ca6215f 100644
--- a/src/termopts.h
+++ b/src/termopts.h
@@ -1,4 +1,4 @@
-/* Flags and paramaters describing user options for handling the terminal.
+/* Flags and parameters describing user options for handling the terminal.
    Copyright (C) 1985, 1986, 1990 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
diff --git a/src/textprop.c b/src/textprop.c
index 89b882b511d..865f35c5fed 100644
--- a/src/textprop.c
+++ b/src/textprop.c
@@ -32,7 +32,7 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
   It is assumed that for any interval plist, a property appears
   only once on the list.  Although some code i.e., remove_properties,
   handles the more general case, the uniqueness of properties is
-  neccessary for the system to remain consistent.  This requirement
+  necessary for the system to remain consistent.  This requirement
   is enforced by the subrs installing properties onto the intervals. */
 
 /* The rest of the file is within this conditional */
diff --git a/src/unexaix.c b/src/unexaix.c
index 3deca01b665..9fa10e3a912 100644
--- a/src/unexaix.c
+++ b/src/unexaix.c
@@ -669,7 +669,7 @@ copy_sym (new, a_out, a_name, new_name)
 /* ****************************************************************
  * mark_x
  *
- * After succesfully building the new a.out, mark it executable
+ * After successfully building the new a.out, mark it executable
  */
 static void
 mark_x (name)
diff --git a/src/unexconvex.c b/src/unexconvex.c
index 09a7dfff400..3be4b86f1ff 100644
--- a/src/unexconvex.c
+++ b/src/unexconvex.c
@@ -438,7 +438,7 @@ make_hdr (new, a_out, data_start, bss_start, entry_address, a_name, new_name)
 
     for( scns = 0; scns < f_hdr.h_nscns; scns++ ) {
 
-        /* This is a cheesey little loop to write out the section headers
+        /* This is a cheesy little loop to write out the section headers
          * in order of increasing virtual address. Dull but effective.
          */
 
@@ -561,7 +561,7 @@ copy_sym (new, a_out, a_name, new_name)
 /* ****************************************************************
  * mark_x
  *
- * After succesfully building the new a.out, mark it executable
+ * After successfully building the new a.out, mark it executable
  */
 static
 mark_x (name)
diff --git a/src/unexec.c b/src/unexec.c
index e8906fe68ad..c07bc1a4be2 100644
--- a/src/unexec.c
+++ b/src/unexec.c
@@ -603,7 +603,7 @@ make_hdr (new, a_out, data_start, bss_start, entry_address, a_name, new_name)
    * .lib), adjust the address of where the section data is in the
    * file, and write out the header.
    *
-   * If any section preceeds .text or .data in the file, this code
+   * If any section precedes .text or .data in the file, this code
    * will not adjust the file pointer for that section correctly.
    */
 
@@ -946,7 +946,7 @@ copy_sym (new, a_out, a_name, new_name)
 /* ****************************************************************
  * mark_x
  *
- * After succesfully building the new a.out, mark it executable
+ * After successfully building the new a.out, mark it executable
  */
 static void
 mark_x (name)
diff --git a/src/unexenix.c b/src/unexenix.c
index ea6cd7d5c20..f20e7cc502f 100644
--- a/src/unexenix.c
+++ b/src/unexenix.c
@@ -228,7 +228,7 @@ copyrec (infd, outfd, len, in_name, out_name)
 /*
  * mark_x
  *
- * After succesfully building the new a.out, mark it executable
+ * After successfully building the new a.out, mark it executable
  */
 static
 mark_x (name)
diff --git a/src/unexmips.c b/src/unexmips.c
index 4eeee03f736..292f0210c53 100644
--- a/src/unexmips.c
+++ b/src/unexmips.c
@@ -281,7 +281,7 @@ unexec (new_name, a_name, data_start, bss_start, entry_address)
 /*
  * mark_x
  *
- * After succesfully building the new a.out, mark it executable
+ * After successfully building the new a.out, mark it executable
  */
 
 static void
diff --git a/src/unexsunos4.c b/src/unexsunos4.c
index b5d80829dc5..c8dff3482dd 100644
--- a/src/unexsunos4.c
+++ b/src/unexsunos4.c
@@ -106,8 +106,8 @@ unexec (new_name, a_name, bndry, bss_start, entry)
 
 
   /*
-   * Remeber a magic cookie so we know we've got the right binary
-   * when remaping.
+   * Remember a magic cookie so we know we've got the right binary
+   * when remapping.
    */
   cookie = time (0);
 
diff --git a/src/xfns.c b/src/xfns.c
index bb505e7962d..e46053ba163 100644
--- a/src/xfns.c
+++ b/src/xfns.c
@@ -584,7 +584,7 @@ x_set_mouse_color (f, arg, oldval)
   BLOCK_INPUT;
 #ifdef HAVE_X11
 
-  /* It's not okay to crash if the user selects a screwey cursor.  */
+  /* It's not okay to crash if the user selects a screwy cursor.  */
   x_catch_errors ();
 
   if (!EQ (Qnil, Vx_pointer_shape))
@@ -1856,7 +1856,7 @@ be shared by the new frame.")
   f->display.x = (struct x_display *) xmalloc (sizeof (struct x_display));
   bzero (f->display.x, sizeof (struct x_display));
 
-  /* Some temprorary default values for height and width. */
+  /* Some temporary default values for height and width. */
   width = 80;
   height = 40;
   f->display.x->left_pos = -1;
@@ -2821,7 +2821,7 @@ clip_contour_top (y_pos, x_pos)
     }
 }
 
-/* Erase the top horzontal lines of the contour, and then extend
+/* Erase the top horizontal lines of the contour, and then extend
    the contour upwards. */
 
 static void
diff --git a/src/xselect.c b/src/xselect.c
index 73394f18a7d..31113acd38e 100644
--- a/src/xselect.c
+++ b/src/xselect.c
@@ -1614,7 +1614,7 @@ Disowning it means there is no such selection.")
   XSetSelectionOwner (display, selection_atom, None, timestamp);
   UNBLOCK_INPUT;
 
-  /* It doesn't seem to be guarenteed that a SelectionClear event will be
+  /* It doesn't seem to be guaranteed that a SelectionClear event will be
      generated for a window which owns the selection when that window sets
      the selection owner to None.  The NCD server does, the MIT Sun4 server
      doesn't.  So we synthesize one; this means we might get two, but
diff --git a/src/xterm.c b/src/xterm.c
index f07c12483ca..9900ab08884 100644
--- a/src/xterm.c
+++ b/src/xterm.c
@@ -703,7 +703,7 @@ XTclear_frame ()
 /* Invert the middle quarter of the frame for .15 sec.  */
 
 /* We use the select system call to do the waiting, so we have to make sure
-   it's avaliable.  If it isn't, we just won't do visual bells.  */
+   it's available.  If it isn't, we just won't do visual bells.  */
 #if defined (HAVE_TIMEVAL) && defined (HAVE_SELECT)
 
 /* Subtract the `struct timeval' values X and Y,
@@ -1288,7 +1288,7 @@ static void XTframe_rehighlight ();
 /* The focus has changed.  Update the frames as necessary to reflect
    the new situation.  Note that we can't change the selected frame
    here, because the lisp code we are interrupting might become confused.
-   Each event gets marked with the frame in which it occured, so the
+   Each event gets marked with the frame in which it occurred, so the
    lisp code can tell when the switch took place by examining the events.  */
 
 static void
@@ -1629,7 +1629,7 @@ static XRectangle last_mouse_glyph;
 
 /* The scroll bar in which the last X motion event occurred.
 
-   If the last X motion event occured in a scroll bar, we set this
+   If the last X motion event occurred in a scroll bar, we set this
    so XTmouse_position can know whether to report a scroll bar motion or
    an ordinary motion.
 
@@ -2027,7 +2027,7 @@ x_scroll_bar_set_handle (bar, start, end, rebuild)
   UNBLOCK_INPUT;
 }
 
-/* Move a scroll bar around on the screen, to accomodate changing
+/* Move a scroll bar around on the screen, to accommodate changing
    window configurations.  */
 static void
 x_scroll_bar_move (bar, top, left, width, height)
@@ -2335,7 +2335,7 @@ x_scroll_bar_handle_click (bar, event, emacs_event)
 
     /* Same deal here as the other #if 0.  */
 #if 0
-    /* Clicks on the handle are always reported as occuring at the top of 
+    /* Clicks on the handle are always reported as occurring at the top of 
        the handle.  */
     if (emacs_event->part == scroll_bar_handle)
       emacs_event->x = bar->start;
@@ -4314,7 +4314,7 @@ x_make_frame_invisible (f)
                          DefaultScreen (x_current_display)))
     {
       UNBLOCK_INPUT_RESIGNAL;
-      error ("can't notify window manager of window withdrawl");
+      error ("can't notify window manager of window withdrawal");
     }
 
 #else /* ! defined (HAVE_X11R4) */
diff --git a/src/xterm.h b/src/xterm.h
index 9608a543cf6..2e3247d61d9 100644
--- a/src/xterm.h
+++ b/src/xterm.h
@@ -488,7 +488,7 @@ struct scroll_bar {
    (used when relating to the rest of the screen) and inside width
    (used when sizing and drawing the scroll bar window itself).
 
-   The handle moves up and down/back and forth in a rectange inset
+   The handle moves up and down/back and forth in a rectangle inset
    from the edges of the scroll bar.  These are widths by which we
    inset the handle boundaries from the scroll bar edges.  */
 #define VERTICAL_SCROLL_BAR_LEFT_BORDER (2)