Spelling fixes.

57 files changed, 93 insertions, 94 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 230e299b7cf..32de942b038 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -2064,7 +2064,7 @@
 
         * window.el (window-auto-delete): Remove.
         (window-deletable-p): Remove argument FORCE.  Don't deal with
-        dedicatedness and previous buffers.
+        dedication and previous buffers.
         (switch-to-prev-buffer): Don't delete window.
         (delete-windows-on): Delete a window's frame if and only if the
         window is dedicated.
diff --git a/lisp/ChangeLog.10 b/lisp/ChangeLog.10
index 0d2255ac0a4..a1cfaee6eaf 100644
--- a/lisp/ChangeLog.10
+++ b/lisp/ChangeLog.10
@@ -1837,7 +1837,7 @@
 2003-05-31  Stefan Monnier  <monnier@cs.yale.edu>
 
         * view.el (view-file, view-file-other-window, view-file-other-frame):
-        Signal an error when trying to visit an inexistent file.
+        Signal an error when trying to visit a nonexistent file.
 
         * vc-hooks.el (vc-call-backend): Give better error message
         when a backend function is missing.
@@ -8053,7 +8053,7 @@
         (gdb-quit): Reset some variables including tool-bar-map.
 
         * gud.el (gdb-running): New variable.
-        (gud-menu-map): Use gdb-running to grey out toolbar buttons
+        (gud-menu-map): Use gdb-running to gray out toolbar buttons
         with gdba in gdb-ui.el.
         (gud-tool-bar-map): Move to avoid byte compiler warning.
 
@@ -22790,7 +22790,7 @@
 2001-11-04  Miles Bader  <miles@gnu.org>
 
         * startup.el (fancy-splash-head): Reapply Gerd's hack to make the
-        shadow of the splash image grey on a dark background instead of black.
+        shadow of the splash image gray on a dark background instead of black.
 
 2001-11-03  Stefan Monnier  <monnier@cs.yale.edu>
 
diff --git a/lisp/ChangeLog.12 b/lisp/ChangeLog.12
index 7df2b4b7488..8721130ec50 100644
--- a/lisp/ChangeLog.12
+++ b/lisp/ChangeLog.12
@@ -15100,7 +15100,7 @@
 2005-12-21  Stefan Monnier  <monnier@iro.umontreal.ca>
 
         * emacs-lisp/lisp.el (lisp-complete-symbol): Don't call
-        delete-windows-on with an inexistent buffer.
+        delete-windows-on with a nonexistent buffer.
 
 2005-12-22  Nick Roberts  <nickrob@snap.net.nz>
 
@@ -31734,7 +31734,7 @@
 2005-02-23  Stefan Monnier  <monnier@iro.umontreal.ca>
 
         * emacs-lisp/debug.el (debug): Hide the buffer if it's not killed.
-        Remove unused and inexistent var `inhibit-trace'.
+        Remove unused and nonexistent var `inhibit-trace'.
         (debugger-mode): Use run-mode-hooks.
         (debugger-list-functions): Add buttons; setup xref stack.
 
diff --git a/lisp/ChangeLog.5 b/lisp/ChangeLog.5
index b536f7f1b66..b3e92b1a50a 100644
--- a/lisp/ChangeLog.5
+++ b/lisp/ChangeLog.5
@@ -2579,7 +2579,7 @@
 1995-03-13  Karl Fogel  <kfogel@floss>
 
         * bookmark.el: Removed C-v bindings; they were inconsistent.
-        Defvarred some variables to nil, solely to avoid compilation warnings.
+        Defvared some variables to nil, solely to avoid compilation warnings.
         Use "Author's Update Number:" instead of "Version:".
         (bookmark-history): New var.
         (bookmark-completing-read): Use `bookmark-history'.
diff --git a/lisp/ChangeLog.7 b/lisp/ChangeLog.7
index df2f5cce23f..b9f8de3b598 100644
--- a/lisp/ChangeLog.7
+++ b/lisp/ChangeLog.7
@@ -15185,7 +15185,7 @@
 1997-06-16  Dan Nicolaescu  <done@ece.arizona.edu>
 
         * icon.el (icon-indent-line): A comment ends at the end of the
-        line, delete call to inexistent function.
+        line, delete call to nonexistent function.
 
         * icon.el (icon-font-lock-keywords-1): Improved regexp.
         (icon-font-lock-keywords-2): Likewise.
@@ -19552,7 +19552,7 @@
         * term.el: Added a lot of new faces, they all start with
         term- and follow a simple lexicographical convention.  Note that
         each change is commented: just search for -mm in the source.
-        (term-char-mode): Added all the "grey-keys" to term-raw-map.
+        (term-char-mode): Added all the "gray-keys" to term-raw-map.
         (term-send-up): Similar, decided to go for the more xterm-like
         \eOA bindings in place of the previous \e[A.
         (term-buffer-maximum-size): New variable.
diff --git a/lisp/ChangeLog.8 b/lisp/ChangeLog.8
index 77ea9fd9d5d..cd685204766 100644
--- a/lisp/ChangeLog.8
+++ b/lisp/ChangeLog.8
@@ -4294,7 +4294,7 @@
 
 1999-07-21  Gerd Moellmann  <gerd@gnu.org>
 
-        * faces.el (toolbar): Grey default background.
+        * faces.el (toolbar): Gray default background.
         (modeline): Ditto.
 
         * image.el (image-type-regexps): New.
diff --git a/lisp/allout.el b/lisp/allout.el
index 47db77f2bbc..68330aa538b 100644
--- a/lisp/allout.el
+++ b/lisp/allout.el
@@ -1952,7 +1952,7 @@ BULLET: A character at the end of the ITEM PREFIX, it must be one of
         plain BULLETs are by default used, according to the DEPTH of the
         TOPIC.  Choice among the distinctive BULLETs is offered when you
         provide a universal argument (\\[universal-argument]) to the
-        TOPIC creation command, or when explictly rebulleting a TOPIC.  The
+        TOPIC creation command, or when explicitly rebulleting a TOPIC.  The
         significance of the various distinctive bullets is purely by
         convention.  See the documentation for the above bullet strings for
         more details.
diff --git a/lisp/bookmark.el b/lisp/bookmark.el
index 51e869e3a21..4d93e01fb2e 100644
--- a/lisp/bookmark.el
+++ b/lisp/bookmark.el
@@ -83,7 +83,7 @@ To specify the file in which to save them, modify the variable
   "The `.emacs.bmk' file used to be called this name.")
 
 
-;; defvarred to avoid a compilation warning:
+;; defvared to avoid a compilation warning:
 (defvar bookmark-file nil
   "Old name for `bookmark-default-file'.")
 
diff --git a/lisp/cedet/ede/autoconf-edit.el b/lisp/cedet/ede/autoconf-edit.el
index bd4a5a627a9..c6545dd9015 100644
--- a/lisp/cedet/ede/autoconf-edit.el
+++ b/lisp/cedet/ede/autoconf-edit.el
@@ -191,7 +191,7 @@ This is to make it compatible with `autoconf-find-last-macro'.
 Assume that MACRO doesn't appear in the buffer yet, so search
 the ordering list `autoconf-preferred-macro-order'."
   ;; Search this list backwards.. heh heh heh
-  ;; This lets us do a reverse search easilly.
+  ;; This lets us do a reverse search easily.
   (let ((ml (member macro (reverse autoconf-preferred-macro-order))))
     (if (not ml) (error "Don't know how to position for %s yet" macro))
     (setq ml (cdr ml))
diff --git a/lisp/cedet/ede/proj.el b/lisp/cedet/ede/proj.el
index 79022be6a5f..a77bb02218b 100644
--- a/lisp/cedet/ede/proj.el
+++ b/lisp/cedet/ede/proj.el
@@ -546,7 +546,7 @@ You may need to add support for this type of file."
                        (file-name-extension (car sources))
                      "")))
           ))
-      ;; Return the disovered compilers
+      ;; Return the discovered compilers.
       comp)))
 
 (defmethod ede-proj-linkers ((obj ede-proj-target))
@@ -580,7 +580,7 @@ Converts all symbols into the objects to be used."
             (while (and avail (not (eieio-instance-inheritor-slot-boundp (car avail) 'sourcetype)))
               (setq avail (cdr avail)))
             (setq link (cdr avail)))))
-      ;; Return the disovered linkers
+      ;; Return the discovered linkers.
       link)))
 
 
diff --git a/lisp/cedet/semantic/analyze.el b/lisp/cedet/semantic/analyze.el
index c275ba96ee4..ef09ea13b42 100644
--- a/lisp/cedet/semantic/analyze.el
+++ b/lisp/cedet/semantic/analyze.el
@@ -57,7 +57,7 @@
 ;;
 ;; context - A semantic datatype representing a point in a buffer.
 ;;
-;; constriant - If a context specifies a specific datatype is needed,
+;; constraint - If a context specifies a specific datatype is needed,
 ;;       that is a constraint.
 ;; constants - Some datatypes define elements of themselves as a
 ;;       constant.  These need to be returned as there would be no
diff --git a/lisp/composite.el b/lisp/composite.el
index 487962ee07c..72317ac470e 100644
--- a/lisp/composite.el
+++ b/lisp/composite.el
@@ -656,7 +656,7 @@ prepending a space before it."
       (if (not (char-charset (lglyph-char glyph) coding))
           (progn
             ;; As the terminal doesn't support this glyph, return a
-            ;; gstring in which each glyph is its own graphme-cluster
+            ;; gstring in which each glyph is its own grapheme-cluster
             ;; of width 1..
             (setq i 0)
             (while (and (< i nglyphs)
diff --git a/lisp/dframe.el b/lisp/dframe.el
index b1eb2d636b9..b4f44e1a308 100644
--- a/lisp/dframe.el
+++ b/lisp/dframe.el
@@ -718,7 +718,7 @@ Argument PROMPT is the prompt to use."
 
 (defun dframe-set-timer (timeout fn &optional _null-on-error)
   "Apply a timer with TIMEOUT, to call FN, or remove a timer if TIMEOUT is nil.
-TIMEOUT is the number of seconds until the dframe controled program
+TIMEOUT is the number of seconds until the dframe controlled program
 timer is called again.  When TIMEOUT is nil, turn off all timeouts.
 This function must be called from the buffer belonging to the program
 who requested the timer.  NULL-ON-ERROR is ignored."
diff --git a/lisp/emacs-lisp/byte-opt.el b/lisp/emacs-lisp/byte-opt.el
index 0630f5f4e4e..c9027fb663d 100644
--- a/lisp/emacs-lisp/byte-opt.el
+++ b/lisp/emacs-lisp/byte-opt.el
@@ -135,7 +135,7 @@
 ;; We'd have to notice defvars and defconsts, since those variables should
 ;; always be dynamic, and attempting to do a lexical binding of them
 ;; should simply do a dynamic binding instead.
-;; But!  We need to know about variables that were not necessarily defvarred
+;; But!  We need to know about variables that were not necessarily defvared
 ;; in the file being compiled (doing a boundp check isn't good enough.)
 ;; Fdefvar() would have to be modified to add something to the plist.
 ;;
diff --git a/lisp/emacs-lisp/bytecomp.el b/lisp/emacs-lisp/bytecomp.el
index 3d593570c4e..9aa230cfe9b 100644
--- a/lisp/emacs-lisp/bytecomp.el
+++ b/lisp/emacs-lisp/bytecomp.el
@@ -178,9 +178,9 @@ adds `c' to it; otherwise adds `.elc'."
 ;; This can be the 'byte-compile property of any symbol.
 (autoload 'byte-compile-inline-expand "byte-opt")
 
-;; This is the entrypoint to the lapcode optimizer pass1.
+;; This is the entry point to the lapcode optimizer pass1.
 (autoload 'byte-optimize-form "byte-opt")
-;; This is the entrypoint to the lapcode optimizer pass2.
+;; This is the entry point to the lapcode optimizer pass2.
 (autoload 'byte-optimize-lapcode "byte-opt")
 (autoload 'byte-compile-unfold-lambda "byte-opt")
 
diff --git a/lisp/emacs-lisp/cconv.el b/lisp/emacs-lisp/cconv.el
index 22db9ddba38..daafd2226ec 100644
--- a/lisp/emacs-lisp/cconv.el
+++ b/lisp/emacs-lisp/cconv.el
@@ -67,7 +67,7 @@
 
 ;; TODO: (not just for cconv but also for the lexbind changes in general)
 ;; - let (e)debug find the value of lexical variables from the stack.
-;; - make eval-region do the eval-sexp-add-defvars danse.
+;; - make eval-region do the eval-sexp-add-defvars dance.
 ;; - byte-optimize-form should be applied before cconv.
 ;;   OTOH, the warnings emitted by cconv-analyze need to come before optimize
 ;;   since afterwards they can because obnoxious (warnings about an "unused
diff --git a/lisp/emacs-lisp/smie.el b/lisp/emacs-lisp/smie.el
index d43ba6c0d3e..afc8c7faa47 100644
--- a/lisp/emacs-lisp/smie.el
+++ b/lisp/emacs-lisp/smie.el
@@ -579,7 +579,7 @@ PREC2 is a table as returned by `smie-precs->prec2' or
                    (smie-debug--describe-cycle
                     table (smie-debug--prec2-cycle csts)))))
         (incf i 10))
-      ;; Propagate equalities back to their source.
+      ;; Propagate equality constraints back to their sources.
       (dolist (eq (nreverse eqs))
         (when (null (cadr eq))
           ;; There's an equality constraint, but we still haven't given
diff --git a/lisp/filesets.el b/lisp/filesets.el
index 269ee331fb2..680a107adfe 100644
--- a/lisp/filesets.el
+++ b/lisp/filesets.el
@@ -267,12 +267,12 @@ SYM to VAL and return t.  If INIT-FLAG is non-nil, set with
     (not ignore-flag)))
 
 (defun filesets-set-default! (sym val)
-  "Call `filestes-set-default' and reset cached data (i.e. rebuild menu)."
+  "Call `filesets-set-default' and reset cached data (i.e. rebuild menu)."
   (when (filesets-set-default sym val)
     (filesets-reset-fileset)))
 
 (defun filesets-set-default+ (sym val)
-  "Call `filestes-set-default' and reset filesets' standard menu."
+  "Call `filesets-set-default' and reset filesets' standard menu."
   (when (filesets-set-default sym val)
     (setq filesets-has-changed-flag t)))
 ;    (filesets-reset-fileset nil t)))
diff --git a/lisp/follow.el b/lisp/follow.el
index 3badb381c57..2273e8920fd 100644
--- a/lisp/follow.el
+++ b/lisp/follow.el
@@ -351,7 +351,7 @@ After that, changing the prefix key requires manipulating keymaps."
 ;; global map.
 (easy-menu-add-item nil '("Tools")
   '("Follow"
-    ;; The Emacs code used to just grey out operations when follow-mode was
+    ;; The Emacs code used to just gray out operations when follow-mode was
     ;; not enabled, whereas the XEmacs code used to remove it altogether.
     ;; Not sure which is preferable, but clearly the preference should not
     ;; depend on the flavor.
diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index 39f43bd8e3b..7e0d60018c2 100644
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -10961,7 +10961,7 @@
 2007-11-14  Denys Duchier  <denys.duchier@univ-orleans.fr>  (tiny change)
 
         * pop3.el (pop3-open-server): Accept and process data more robustly at
-        connexion start to avoid spurious "POP SSL connexion failed" errors.
+        connection start to avoid spurious "POP SSL connection failed" errors.
 
 2007-11-14  Katsumi Yamaoka  <yamaoka@jpl.org>
 
@@ -16516,7 +16516,7 @@
 2005-07-01  Katsumi Yamaoka  <yamaoka@jpl.org>
 
         * gnus-art.el (article-display-face): Improve the efficiency.
-        (article-display-x-face): Ditto; remove grey x-face stuff.
+        (article-display-x-face): Ditto; remove gray x-face stuff.
 
 2005-06-30  Katsumi Yamaoka  <yamaoka@jpl.org>
 
diff --git a/lisp/gnus/ChangeLog.1 b/lisp/gnus/ChangeLog.1
index 8d4b1a086db..a2d6d61efd4 100644
--- a/lisp/gnus/ChangeLog.1
+++ b/lisp/gnus/ChangeLog.1
@@ -3471,7 +3471,7 @@
         * pop3.el (pop3-md5): `with-temp-buffer' doesn't exist in Emacs
         19.34.
 
-        * nneething.el (nneething-directory): Defvarred.
+        * nneething.el (nneething-directory): Defvared.
 
         * message.el: Autoloaded nndraft things.
         (message-set-auto-save-file-name): Use it.
diff --git a/lisp/gnus/ChangeLog.2 b/lisp/gnus/ChangeLog.2
index 952aae28b17..6b11a956a99 100644
--- a/lisp/gnus/ChangeLog.2
+++ b/lisp/gnus/ChangeLog.2
@@ -5120,7 +5120,7 @@
         * gnus-util.el (gnus-prin1-to-string): Bind print-length and
         print-level.
 
-        * gnus-art.el (article-display-x-face): Removed grey x-face stuff.
+        * gnus-art.el (article-display-x-face): Removed gray x-face stuff.
         (gnus-treat-display-grey-xface): Removed.
 
         * gnus-fun.el (gnus-grab-cam-face): New.
@@ -9836,7 +9836,7 @@
 2002-02-08  ShengHuo ZHU  <zsh@cs.rochester.edu>
 
         * gnus-art.el (gnus-treat-display-grey-xface): New variable.
-        (article-display-x-face): Use it.  Disable grey xface, if
+        (article-display-x-face): Use it.  Disable gray xface, if
         uncompface is not found.
 
         * message.el (message-mode): Don't enable multibyte on an indirect
@@ -11350,7 +11350,7 @@
         * gnus-fun.el (gnus-convert-gray-x-face-to-xpm): Renamed.
 
         * gnus-art.el (gnus-ignored-headers): Hide all X-Faces.
-        (article-display-x-face): Display grey X-Faces.
+        (article-display-x-face): Display gray X-Faces.
 
         * gnus-fun.el (gnus-convert-gray-x-face-region): New function.
         (gnus-convert-gray-x-face-to-ppm): Ditto.
diff --git a/lisp/gnus/mm-bodies.el b/lisp/gnus/mm-bodies.el
index 695451ddc45..ee7ba1c193b 100644
--- a/lisp/gnus/mm-bodies.el
+++ b/lisp/gnus/mm-bodies.el
@@ -87,9 +87,9 @@ If no encoding was done, nil is returned."
             (goto-char (point-min))
             (if (re-search-forward "[^\x0-\x7f]" nil t)
                 (or mail-parse-charset
-                    (message-options-get 'mm-encody-body-charset)
+                    (message-options-get 'mm-body-charset-encoding-alist)
                     (message-options-set
-                     'mm-encody-body-charset
+                     'mm-body-charset-encoding-alist
                      (mm-read-coding-system "Charset used in the article: ")))
               ;; The logic in `mml-generate-mime-1' confirms that it's OK
               ;; to return nil here.
diff --git a/lisp/gnus/mml.el b/lisp/gnus/mml.el
index 352fa329e3e..8aa5fbff6b8 100644
--- a/lisp/gnus/mml.el
+++ b/lisp/gnus/mml.el
@@ -1454,7 +1454,7 @@ Should be adopted if code in `message-send-mail' is changed."
   "Display current buffer with Gnus, in a new buffer.
 If RAW, display a raw encoded MIME message.
 
-The window layout for the preview buffer is controled by the variables
+The window layout for the preview buffer is controlled by the variables
 `special-display-buffer-names', `special-display-regexps', or
 `gnus-buffer-configuration' (the first match made will be used),
 or the `pop-to-buffer' function."
diff --git a/lisp/gnus/nnml.el b/lisp/gnus/nnml.el
index 399008cec1b..59e06364f42 100644
--- a/lisp/gnus/nnml.el
+++ b/lisp/gnus/nnml.el
@@ -1213,7 +1213,7 @@ Use the nov database for the current group if available."
                 ;; #### already belongs to a range, whereas the corresponding
                 ;; #### article doesn't exist (for example, if you delete an
                 ;; #### article). For that reason, it is important to update
-                ;; #### the ranges (meaning remove inexistent articles) before
+                ;; #### the ranges (meaning remove nonexistent articles) before
                 ;; #### doing anything on them.
                 ;; 2 a/ read articles:
                 (let ((read (gnus-info-read info)))
diff --git a/lisp/gnus/pop3.el b/lisp/gnus/pop3.el
index ee3e6582e80..0f7a450b30c 100644
--- a/lisp/gnus/pop3.el
+++ b/lisp/gnus/pop3.el
@@ -270,11 +270,11 @@ Use streaming commands."
     message-count))
 
 (defcustom pop3-stream-type nil
-  "*Transport security type for POP3 connexions.
-This may be either nil (plain connexion), `ssl' (use an
+  "*Transport security type for POP3 connections.
+This may be either nil (plain connection), `ssl' (use an
 SSL/TSL-secured stream) or `starttls' (use the starttls mechanism
 to turn on TLS security after opening the stream).  However, if
-this is nil, `ssl' is assumed for connexions to port
+this is nil, `ssl' is assumed for connections to port
 995 (pop3s)."
   :version "23.1" ;; No Gnus
   :group 'pop3
diff --git a/lisp/ido.el b/lisp/ido.el
index f425fd5fc63..f2dcba614a9 100644
--- a/lisp/ido.el
+++ b/lisp/ido.el
@@ -1692,7 +1692,7 @@ This function also adds a hook to the minibuffer."
 (defun ido-nonreadable-directory-p (dir)
   ;; Return t if dir is a directory, but not readable
   ;; Do not check for non-readable directories via tramp, as this causes a premature
-  ;; connect on incomplete tramp paths (after entring just method:).
+  ;; connect on incomplete tramp paths (after entering just method:).
   (let ((ido-enable-tramp-completion nil))
     (and (ido-final-slash dir)
          (not (ido-is-unc-host dir))
@@ -1702,7 +1702,7 @@ This function also adds a hook to the minibuffer."
 (defun ido-directory-too-big-p (dir)
   ;; Return t if dir is a directory, but too big to show
   ;; Do not check for non-readable directories via tramp, as this causes a premature
-  ;; connect on incomplete tramp paths (after entring just method:).
+  ;; connect on incomplete tramp paths (after entering just method:).
   (let ((ido-enable-tramp-completion nil))
     (and (numberp ido-max-directory-size)
          (ido-final-slash dir)
diff --git a/lisp/international/cp51932.el b/lisp/international/cp51932.el
index d4a347d43aa..a6489268578 100644
--- a/lisp/international/cp51932.el
+++ b/lisp/international/cp51932.el
@@ -1,5 +1,5 @@
 ;;; cp51932.el -- translation table for CP51932. -*- no-byte-compile: t -*-
-;;; Automatically genrated from CP932-2BYTE.map
+;;; Automatically generated from CP932-2BYTE.map
 (let ((map
        '(;JISEXT<->UNICODE
          (#x2D21 . #x2460)
@@ -468,4 +468,3 @@
               (setcar x (cdr x)) (setcdr x tmp)))
         map)
   (define-translation-table 'cp51932-encode map))
-
diff --git a/lisp/ldefs-boot.el b/lisp/ldefs-boot.el
index f6c706fdce9..fb1735cf6a1 100644
--- a/lisp/ldefs-boot.el
+++ b/lisp/ldefs-boot.el
@@ -819,7 +819,7 @@ BULLET: A character at the end of the ITEM PREFIX, it must be one of
         plain BULLETs are by default used, according to the DEPTH of the
         TOPIC.  Choice among the distinctive BULLETs is offered when you
         provide a universal argument (\\[universal-argument]) to the
-        TOPIC creation command, or when explictly rebulleting a TOPIC.  The
+        TOPIC creation command, or when explicitly rebulleting a TOPIC.  The
         significance of the various distinctive bullets is purely by
         convention.  See the documentation for the above bullet strings for
         more details.
@@ -10040,7 +10040,7 @@ beginning of the expanded text.
 
 If ARG is a list of numbers, point is placed according to the first
 member of the list, but you can visit the other specified positions
-cyclicaly with the functions `expand-jump-to-previous-slot' and
+cyclically with the functions `expand-jump-to-previous-slot' and
 `expand-jump-to-next-slot'.
 
 If ARG is omitted, point is placed at the end of the expanded text.
@@ -24377,7 +24377,7 @@ will be automatically rechecked when Emacs becomes idle; the
 rechecking will be paused whenever there is input pending.
 
 By default, uses a vacuous schema that allows any well-formed XML
-document.  A schema can be specified explictly using
+document.  A schema can be specified explicitly using
 \\[rng-set-schema-file-and-validate], or implicitly based on the buffer's
 file name or on the root element name.  In each case the schema must
 be a RELAX NG schema using the compact schema (such schemas
diff --git a/lisp/man.el b/lisp/man.el
index 14fdac4e5da..0d991a76f52 100644
--- a/lisp/man.el
+++ b/lisp/man.el
@@ -1095,7 +1095,7 @@ Same for the ANSI bold and normal escape sequences."
       (replace-match "+")
       (put-text-property (1- (point)) (point) 'face 'bold))
     ;; When the header is longer than the manpage name, groff tries to
-    ;; condense it to a shorter line interspered with ^H.  Remove ^H with
+    ;; condense it to a shorter line interspersed with ^H.  Remove ^H with
     ;; their preceding chars (but don't put Man-overstrike-face).  (Bug#5566)
     (goto-char (point-min))
     (while (re-search-forward ".\b" nil t) (backward-delete-char 2))
@@ -1189,7 +1189,7 @@ script would have done them."
   (goto-char (point-min))
   (while (re-search-forward "[-|]\\(\b[-|]\\)+" nil t) (replace-match "+"))
   ;; When the header is longer than the manpage name, groff tries to
-  ;; condense it to a shorter line interspered with ^H.  Remove ^H with
+  ;; condense it to a shorter line interspersed with ^H.  Remove ^H with
   ;; their preceding chars (but don't put Man-overstrike-face).  (Bug#5566)
   (goto-char (point-min))
   (while (re-search-forward ".\b" nil t) (backward-delete-char 2))
diff --git a/lisp/mh-e/ChangeLog.1 b/lisp/mh-e/ChangeLog.1
index 1c0f3ff6300..871b84dd039 100644
--- a/lisp/mh-e/ChangeLog.1
+++ b/lisp/mh-e/ChangeLog.1
@@ -7385,7 +7385,7 @@
         (mh-visit-folder) alias, and v (mh-visit-folder).
         (mh-index-folder-mode-help-messages): Changes for above.
         (mh-index-folder-message-menu, mh-index-folder-folder-menu): New
-        menus. I decided to delete the unavailable items since greying out
+        menus. I decided to delete the unavailable items since graying out
         implies that the user can do something to access them. In this
         case, that's not the case. Well, that's not entirely true--the
         user could write code for those functions ;-).
diff --git a/lisp/mpc.el b/lisp/mpc.el
index 6c2556b1f39..224131623f4 100644
--- a/lisp/mpc.el
+++ b/lisp/mpc.el
@@ -1651,7 +1651,7 @@ Return non-nil if a selection was deactivated."
 ;;; Hierarchical tagbrowser ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;; Todo:
 ;; - Add a button on each dir to open/close it (?)
-;; - add the parent dir on the previous line, greyed-out, if it's not
+;; - add the parent dir on the previous line, grayed-out, if it's not
 ;;   present (because we're in the non-selected part and the parent is
 ;;   in the selected part).
 
diff --git a/lisp/net/ange-ftp.el b/lisp/net/ange-ftp.el
index 48502540e29..7ae6912cf8f 100644
--- a/lisp/net/ange-ftp.el
+++ b/lisp/net/ange-ftp.el
@@ -49,7 +49,7 @@
 ;; 'user@' part may be omitted.  This syntax can be customized to a certain
 ;; extent by changing ange-ftp-name-format.  There are limitations.
 ;; The `host' part has an optional suffix `#port' which may be used to
-;; specify a non-default port number for the connexion.
+;; specify a non-default port number for the connection.
 ;;
 ;; If the user part is omitted then ange-ftp generates a default user
 ;; instead whose value depends on the variable ange-ftp-default-user.
diff --git a/lisp/nxml/rng-valid.el b/lisp/nxml/rng-valid.el
index 876e582ed21..9a29e3d4cca 100644
--- a/lisp/nxml/rng-valid.el
+++ b/lisp/nxml/rng-valid.el
@@ -230,7 +230,7 @@ will be automatically rechecked when Emacs becomes idle; the
 rechecking will be paused whenever there is input pending.
 
 By default, uses a vacuous schema that allows any well-formed XML
-document.  A schema can be specified explictly using
+document.  A schema can be specified explicitly using
 \\[rng-set-schema-file-and-validate], or implicitly based on the buffer's
 file name or on the root element name.  In each case the schema must
 be a RELAX NG schema using the compact schema \(such schemas
diff --git a/lisp/org/org-agenda.el b/lisp/org/org-agenda.el
index 50761ede7cb..2f4617f5146 100644
--- a/lisp/org/org-agenda.el
+++ b/lisp/org/org-agenda.el
@@ -800,7 +800,7 @@ will only be dimmed."
   :group 'org-agenda-todo-list
   :type '(choice
           (const :tag "Do not dim" nil)
-          (const :tag "Dim to a grey face" t)
+          (const :tag "Dim to a gray face" t)
           (const :tag "Make invisible" invisible)))
 
 (defcustom org-timeline-show-empty-dates 3
diff --git a/lisp/play/gomoku.el b/lisp/play/gomoku.el
index 33fcf451ebb..ee6b67e6109 100644
--- a/lisp/play/gomoku.el
+++ b/lisp/play/gomoku.el
@@ -379,7 +379,7 @@ Other useful commands:\n
                   best-square square
                   score-max   score)
             (aset gomoku-score-table square -1))) ; no: kill it !
-       ;; If score is equally good, choose randomly. But first check freeness:
+       ;; If score is equally good, choose randomly. But first check freedom:
        ((not (zerop (aref gomoku-board square)))
         (aset gomoku-score-table square -1))
        ((zerop (random (setq count (1+ count))))
diff --git a/lisp/play/landmark.el b/lisp/play/landmark.el
index 8629baf35d3..9ef03725c60 100644
--- a/lisp/play/landmark.el
+++ b/lisp/play/landmark.el
@@ -385,7 +385,7 @@ is non-nil.  One interesting value is `turn-on-font-lock'."
                   best-square square
                   score-max   score)
             (aset landmark-score-table square -1))) ; no: kill it !
-       ;; If score is equally good, choose randomly. But first check freeness:
+       ;; If score is equally good, choose randomly. But first check freedom:
        ((not (zerop (aref landmark-board square)))
         (aset landmark-score-table square -1))
        ((zerop (random (setq count (1+ count))))
diff --git a/lisp/progmodes/ada-mode.el b/lisp/progmodes/ada-mode.el
index ad5d5def888..64734420a8c 100644
--- a/lisp/progmodes/ada-mode.el
+++ b/lisp/progmodes/ada-mode.el
@@ -3939,7 +3939,7 @@ If NOERROR is non-nil, it only returns nil if no matching start found."
        ;; processing them recursively avoids the need for any special
        ;; handling.
        ;; Nothing should be done if we have only the specs or a
-       ;; generic instantion.
+       ;; generic instantiation.
 
        ((and (looking-at "\\<procedure\\|function\\>"))
         (if first
@@ -4401,7 +4401,7 @@ Moves to 'begin' if in a declarative part."
           (ada-goto-matching-end 1))
 
          ;; on first line of subprogram body
-         ;; Do nothing for specs or generic instantion, since these are
+         ;; Do nothing for specs or generic instantiation, since these are
          ;; handled as the general case (find the enclosing block)
          ;; We also need to make sure that we ignore nested subprograms
          ((save-excursion
diff --git a/lisp/progmodes/cc-langs.el b/lisp/progmodes/cc-langs.el
index 4a6344727b4..37818638d41 100644
--- a/lisp/progmodes/cc-langs.el
+++ b/lisp/progmodes/cc-langs.el
@@ -433,7 +433,7 @@ element is a cons where the car is the character to modify and the cdr
 the new syntax, as accepted by `modify-syntax-entry'."
   ;; The $ character is not allowed in most languages (one exception
   ;; is Java which allows it for legacy reasons) but we still classify
-  ;; it as an indentifier character since it's often used in various
+  ;; it as an identifier character since it's often used in various
   ;; machine generated identifiers.
   t    '((?_ . "w") (?$ . "w"))
   (objc java) (append '((?@ . "w"))
diff --git a/lisp/progmodes/cperl-mode.el b/lisp/progmodes/cperl-mode.el
index 07359539256..13fa310106c 100644
--- a/lisp/progmodes/cperl-mode.el
+++ b/lisp/progmodes/cperl-mode.el
@@ -1388,12 +1388,12 @@ The expansion is entirely correct because it uses the C preprocessor."
 
 ;;; These two must be unwound, otherwise take exponential time
 (defconst cperl-maybe-white-and-comment-rex "[ \t\n]*\\(#[^\n]*\n[ \t\n]*\\)*"
-"Regular expression to match optional whitespace with interpspersed comments.
+"Regular expression to match optional whitespace with interspersed comments.
 Should contain exactly one group.")
 
 ;;; This one is tricky to unwind; still very inefficient...
 (defconst cperl-white-and-comment-rex "\\([ \t\n]\\|#[^\n]*\n\\)+"
-"Regular expression to match whitespace with interpspersed comments.
+"Regular expression to match whitespace with interspersed comments.
 Should contain exactly one group.")
 
 
diff --git a/lisp/progmodes/f90.el b/lisp/progmodes/f90.el
index ce04d8b390e..95b8d810028 100644
--- a/lisp/progmodes/f90.el
+++ b/lisp/progmodes/f90.el
@@ -724,7 +724,7 @@ Can be overridden by the value of `font-lock-maximum-decoration'.")
          ["Reset to Saved" Custom-reset-saved :active t
           :help "Reset all edited or set settings to saved"]
          ["Reset to Standard Settings" Custom-reset-standard :active t
-          :help "Erase all cusomizations in buffer"]
+          :help "Erase all customizations in buffer"]
          )
         "--"
         ["Indent Subprogram" f90-indent-subprogram t]
diff --git a/lisp/progmodes/fortran.el b/lisp/progmodes/fortran.el
index e98ca58f3e0..2dac46a6d5b 100644
--- a/lisp/progmodes/fortran.el
+++ b/lisp/progmodes/fortran.el
@@ -665,7 +665,7 @@ Used in the Fortran entry in `hs-special-modes-alist'.")
          ["Reset to Saved" Custom-reset-saved :active t
           :help "Reset all edited or set settings to saved"]
          ["Reset to Standard Settings" Custom-reset-standard :active t
-          :help "Erase all cusomizations in buffer"]
+          :help "Erase all customizations in buffer"]
          )
         "--"
         ["Comment Region" fortran-comment-region mark-active]
diff --git a/lisp/progmodes/gud.el b/lisp/progmodes/gud.el
index 854cc664b30..406db76487d 100644
--- a/lisp/progmodes/gud.el
+++ b/lisp/progmodes/gud.el
@@ -103,7 +103,7 @@ If SOFT is non-nil, returns nil if the symbol doesn't already exist."
 
 (defvar gud-running nil
   "Non-nil if debugged program is running.
-Used to grey out relevant toolbar icons.")
+Used to gray out relevant toolbar icons.")
 
 (defvar gud-target-name "--unknown--"
   "The apparent name of the program being debugged in a gud buffer.")
diff --git a/lisp/progmodes/idlw-shell.el b/lisp/progmodes/idlw-shell.el
index c35562a9c5e..aa46b54d848 100644
--- a/lisp/progmodes/idlw-shell.el
+++ b/lisp/progmodes/idlw-shell.el
@@ -2903,7 +2903,7 @@ from `idlwave-shell-examine-alist' via mini-buffer shortcut key."
          ;; Move to beginning of current or previous expression
          (if (looking-at "\\<\\|(")
              ;; At beginning of expression, don't move backwards unless
-             ;; this is at the end of an indentifier.
+             ;; this is at the end of an identifier.
              (if (looking-at "\\>")
                  (backward-sexp))
            (backward-sexp))
diff --git a/lisp/progmodes/sql.el b/lisp/progmodes/sql.el
index af9ab537893..03e095b6bfc 100644
--- a/lisp/progmodes/sql.el
+++ b/lisp/progmodes/sql.el
@@ -96,7 +96,7 @@
 ;; This improves the interaction under Emacs but it still is somewhat
 ;; awkward.
 
-;; Quoted identifiers are not supported for hilighting.  Most
+;; Quoted identifiers are not supported for highlighting.  Most
 ;; databases support the use of double quoted strings in place of
 ;; identifiers; ms (Microsoft SQLServer) also supports identifiers
 ;; enclosed within brackets [].
@@ -1329,9 +1329,9 @@ statement.  The format of variable should be a valid
 ;; are not followed closely, and most vendors offer significant
 ;; capabilities beyond those defined in the standard specifications.
 
-;; SQL mode provides support for hilighting based on the product.  In
-;; addition to hilighting the product keywords, any ANSI keywords not
-;; used by the product are also hilighted.  This will help identify
+;; SQL mode provides support for highlighting based on the product.  In
+;; addition to highlighting the product keywords, any ANSI keywords not
+;; used by the product are also highlighted.  This will help identify
 ;; keywords that could be restricted in future versions of the product
 ;; or might be a problem if ported to another product.
 
@@ -2506,7 +2506,7 @@ See `sql-product-alist' for a list of products and supported features."
   "Configure font-lock and imenu with product-specific settings.
 
 The KEYWORDS-ONLY flag is passed to font-lock to specify whether
-only keywords should be hilighted and syntactic hilighting
+only keywords should be highlighted and syntactic highlighting
 skipped.  The IMENU flag indicates whether `imenu-mode' should
 also be configured."
 
@@ -3807,7 +3807,7 @@ you entered, right above the output it created.
 
   ;; Note that making KEYWORDS-ONLY nil will cause havoc if you try
   ;; SELECT 'x' FROM DUAL with SQL*Plus, because the title of the column
-  ;; will have just one quote.  Therefore syntactic hilighting is
+  ;; will have just one quote.  Therefore syntactic highlighting is
   ;; disabled for interactive buffers.  No imenu support.
   (sql-product-font-lock t nil)
 
diff --git a/lisp/replace.el b/lisp/replace.el
index 4ea3f747caa..a46f62ae139 100644
--- a/lisp/replace.el
+++ b/lisp/replace.el
@@ -1663,7 +1663,7 @@ with the `noescape' argument set.
                               t t)))
 
 (defun replace-loop-through-replacements (data count)
-  ;; DATA is a vector contaning the following values:
+  ;; DATA is a vector containing the following values:
   ;;   0 next-rotate-count
   ;;   1 repeat-count
   ;;   2 next-replacement
diff --git a/lisp/speedbar.el b/lisp/speedbar.el
index 30642e8f2f7..b8a734784be 100644
--- a/lisp/speedbar.el
+++ b/lisp/speedbar.el
@@ -2101,7 +2101,7 @@ cell of the form ( 'DIRLIST . 'FILELIST )."
       ;; If the shown files variable has extra directories, then
       ;; it is our responsibility to redraw them all
       ;; Luckily, the nature of inserting items into this list means
-      ;; that by reversing it, we can easilly go in the right order
+      ;; that by reversing it, we can easily go in the right order
       (let ((sf (cdr (reverse speedbar-shown-directories))))
         (setq speedbar-shown-directories
               (list (expand-file-name default-directory)))
diff --git a/lisp/term.el b/lisp/term.el
index aa76e41f595..484bc36363e 100644
--- a/lisp/term.el
+++ b/lisp/term.el
@@ -40,7 +40,7 @@
 ;; overhead this has became so small that IMHO is surely outweighted by
 ;; the benefits you get but, as usual, YMMV
 ;;
-;; Important caveat, when deciding the cursor/'grey keys' keycodes I had to
+;; Important caveat, when deciding the cursor/'gray keys' keycodes I had to
 ;; make a choice: on my Linux box this choice allows me to run all the
 ;; ncurses applications without problems but make these keys
 ;; incomprehensible to all the cursesX programs.  Your mileage may vary so
@@ -910,7 +910,7 @@ is buffer-local."
   (setq term-raw-escape-map
         (copy-keymap (lookup-key (current-global-map) "\C-x")))
 
-  ;; Added nearly all the 'grey keys' -mm
+  ;; Added nearly all the 'gray keys' -mm
 
   (if (featurep 'xemacs)
       (define-key term-raw-map [button2] 'term-mouse-paste)
diff --git a/lisp/term/common-win.el b/lisp/term/common-win.el
index c13d22dde71..63c8840621c 100644
--- a/lisp/term/common-win.el
+++ b/lisp/term/common-win.el
@@ -281,11 +281,11 @@ have been processed."
 ;; The ordering of the colors is chosen for the user's convenience in
 ;; `list-colors-display', which displays the reverse of this list.
 ;; Roughly speaking, `list-colors-display' orders by (i) named shades
-;; of grey with hue 0.0, sorted by value (ii) named colors with
+;; of gray with hue 0.0, sorted by value (ii) named colors with
 ;; saturation 1.0, sorted by hue, (iii) named non-white colors with
 ;; saturation less than 1.0, sorted by hue, (iv) other named shades of
 ;; white, (v) numbered colors sorted by hue, and (vi) numbered shades
-;; of grey.
+;; of gray.
 
 (declare-function ns-list-colors "nsfns.m" (&optional frame))
 
diff --git a/lisp/textmodes/conf-mode.el b/lisp/textmodes/conf-mode.el
index 1127e6a5d20..40d682c3d93 100644
--- a/lisp/textmodes/conf-mode.el
+++ b/lisp/textmodes/conf-mode.el
@@ -185,7 +185,7 @@ not align (only setting space according to `conf-assignment-space')."
      (2 'font-lock-constant-face nil t))
     ;; section { ... } (do this last because some assign ...{...)
     ("^[ \t]*\\([^=:\n]+?\\)[ \t\n]*{[^{}]*?$" 1 'font-lock-type-face prepend))
-  "Keywords to hilight in Conf mode.")
+  "Keywords to highlight in Conf mode.")
 
 (defvar conf-javaprop-font-lock-keywords
   '(;; var=val
@@ -197,7 +197,7 @@ not align (only setting space according to `conf-assignment-space')."
      (5 'font-lock-variable-name-face nil t)
      (6 'font-lock-constant-face nil t)
      (7 'font-lock-variable-name-face nil t)))
-  "Keywords to hilight in Conf Java Properties mode.")
+  "Keywords to highlight in Conf Java Properties mode.")
 
 (defvar conf-space-keywords-alist
   '(("\\`/etc/gpm/" . "key\\|name\\|foreground\\|background\\|border\\|head")
@@ -240,7 +240,7 @@ This variable is best set in the file local variables, or through
      (1 'font-lock-variable-name-face))
     ;; section { ... } (do this last because some assign ...{...)
     ("^[ \t]*\\([^:\n]+\\)[ \t\n]*{[^{}]*?$" 1 'font-lock-type-face prepend))
-  "Keywords to hilight in Conf Colon mode.")
+  "Keywords to highlight in Conf Colon mode.")
 
 (defvar conf-assignment-sign ?=
   "Sign used for assignments (char or string).")
diff --git a/lisp/textmodes/ispell.el b/lisp/textmodes/ispell.el
index 704fad4fb3b..d0967d63740 100644
--- a/lisp/textmodes/ispell.el
+++ b/lisp/textmodes/ispell.el
@@ -2399,7 +2399,8 @@ Optional REFRESH will unhighlighted then highlight, using block cursor
            (setq start (1+ start))))    ; On block non-refresh, inc start.
   (let ((modified (buffer-modified-p))  ; don't allow this fn to modify buffer
         (buffer-read-only nil)          ; Allow highlighting read-only buffers.
-        (text (buffer-substring-no-properties start end)) ; Save hilight region
+        (text (buffer-substring-no-properties start end))
+                                        ; Save highlight region.
         (inhibit-quit t)                ; inhibit interrupt processing here.
         (buffer-undo-list t))           ; don't clutter the undo list.
     (goto-char end)
@@ -3977,7 +3978,7 @@ Both should not be used to define a buffer-local dictionary."
 ; LocalWords:  Francais Nederlands charset autoloaded popup nonmenu regexp num
 ; LocalWords:  AMStex hspace includeonly nocite epsfig displaymath eqnarray reg
 ; LocalWords:  minipage modeline pers dict unhighlight buf grep sync prev inc
-; LocalWords:  fn hilight oldot NB AIX msg init read's bufs pt cmd Quinlan eg
+; LocalWords:  fn oldot NB AIX msg init read's bufs pt cmd Quinlan eg
 ; LocalWords:  uuencoded unidiff sc nn VM SGML eval IspellPersDict unsplitable
 ; LocalWords:  lns XEmacs HTML casechars Multibyte
 
diff --git a/lisp/textmodes/reftex-sel.el b/lisp/textmodes/reftex-sel.el
index b4e15fd2776..f4f10f1d1e0 100644
--- a/lisp/textmodes/reftex-sel.el
+++ b/lisp/textmodes/reftex-sel.el
@@ -570,13 +570,13 @@ Useful for large TOC's."
    nil t)
   (beginning-of-line))
 (defun reftex-select-next-heading (&optional arg)
-  "Move to next table of contentes line."
+  "Move to next table of contents line."
   (interactive "p")
   (end-of-line)
   (re-search-forward "^ " nil t arg)
   (beginning-of-line))
 (defun reftex-select-previous-heading (&optional arg)
-  "Move to previous table of contentes line."
+  "Move to previous table of contents line."
   (interactive "p")
   (re-search-backward "^ " nil t arg))
 (defun reftex-select-quit ()
diff --git a/lisp/textmodes/rst.el b/lisp/textmodes/rst.el
index 81e92487eb0..64dffe78d50 100644
--- a/lisp/textmodes/rst.el
+++ b/lisp/textmodes/rst.el
@@ -2716,7 +2716,7 @@ general but you do not like the details."
        (rst-define-level-faces)))
 
 ;; Faces for displaying items on several levels; these definitions define
-;; different shades of grey where the lightest one (i.e. least contrasting) is
+;; different shades of gray where the lightest one (i.e. least contrasting) is
 ;; used for level 1
 (defcustom rst-level-face-max 6
   "Maximum depth of levels for which section title faces are defined."
diff --git a/lisp/textmodes/tex-mode.el b/lisp/textmodes/tex-mode.el
index c4892ce572c..34bd24fba3a 100644
--- a/lisp/textmodes/tex-mode.el
+++ b/lisp/textmodes/tex-mode.el
@@ -2254,7 +2254,7 @@ Only applies the FSPEC to the args part of FORMAT."
     ;; Remove those commands whose input was considered stable for
     ;; some other command (typically if (t . "%.pdf") is inactive
     ;; then we're using pdflatex and the fact that the dvi file
-    ;; is inexistent doesn't matter).
+    ;; is nonexistent doesn't matter).
     (let ((tmp nil))
       (dolist (cmd cmds)
         (unless (member (nth 1 cmd) unchanged-in)
diff --git a/lisp/url/ChangeLog b/lisp/url/ChangeLog
index 47f006eebda..48d2caf35f4 100644
--- a/lisp/url/ChangeLog
+++ b/lisp/url/ChangeLog
@@ -1977,7 +1977,7 @@
 
         * lisp/url-gw.el (url-gw-inhibit-code-conversion): Remove.
         (url-open-stream): Bind coding-system-for{read,write} when setting
-        up the connexion.  Don't call url-gw-inhibit-code-conversion.
+        up the connection.  Don't call url-gw-inhibit-code-conversion.
 
 2001-05-24  William M. Perry  <wmperry@gnu.org>
 
@@ -2516,4 +2516,3 @@
 
   You should have received a copy of the GNU General Public License
   along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
-
diff --git a/lisp/vc/ediff-help.el b/lisp/vc/ediff-help.el
index ddd9371b060..ee7837b29a3 100644
--- a/lisp/vc/ediff-help.el
+++ b/lisp/vc/ediff-help.el
@@ -50,7 +50,7 @@ For help on a specific command:  Click Button 2 over it; or
 (defconst ediff-long-help-message-compare3
   "
 p,DEL -previous diff |     | -vert/horiz split   | xy -copy buf X's region to Y
-n,SPC -next diff     |     h -hilighting         | rx -restore buf X's old diff
+n,SPC -next diff     |     h -highlighting       | rx -restore buf X's old diff
     j -jump to diff  |     @ -auto-refinement    |  * -refine current region
    gx -goto X's point|    ## -ignore whitespace  |  ! -update diff regions
   C-l -recenter      |    #c -ignore case        |
@@ -64,7 +64,7 @@ Normally, not a user option.  See `ediff-help-message' for details.")
 (defconst ediff-long-help-message-compare2
   "
 p,DEL -previous diff |     | -vert/horiz split   |a/b -copy A/B's region to B/A
-n,SPC -next diff     |     h -hilighting         | rx -restore buf X's old diff
+n,SPC -next diff     |     h -highlighting       | rx -restore buf X's old diff
     j -jump to diff  |     @ -auto-refinement    |  * -refine current region
    gx -goto X's point|    ## -ignore whitespace  |  ! -update diff regions
   C-l -recenter      |    #c -ignore case        |
@@ -78,7 +78,7 @@ Normally, not a user option.  See `ediff-help-message' for details.")
 (defconst ediff-long-help-message-narrow2
   "
 p,DEL -previous diff |     | -vert/horiz split   |a/b -copy A/B's region to B/A
-n,SPC -next diff     |     h -hilighting         | rx -restore buf X's old diff
+n,SPC -next diff     |     h -highlighting       | rx -restore buf X's old diff
     j -jump to diff  |     @ -auto-refinement    |  * -refine current region
    gx -goto X's point|    ## -ignore whitespace  |  ! -update diff regions
   C-l -recenter      |    #c -ignore case        |  % -narrow/widen buffs
@@ -92,7 +92,7 @@ Normally, not a user option.  See `ediff-help-message' for details.")
 (defconst ediff-long-help-message-word-mode
   "
 p,DEL -previous diff |     | -vert/horiz split   | xy -copy buf X's region to Y
-n,SPC -next diff     |     h -hilighting         | rx -restore buf X's old diff
+n,SPC -next diff     |     h -highlighting       | rx -restore buf X's old diff
     j -jump to diff  |                           |
    gx -goto X's point|    % -narrow/widen buffs  |  ! -recompute diffs
   C-l -recenter      |    #c -ignore case        |
@@ -106,7 +106,7 @@ Normally, not a user option.  See `ediff-help-message' for details.")
 (defconst ediff-long-help-message-merge
   "
 p,DEL -previous diff |     | -vert/horiz split   |  x -copy buf X's region to C
-n,SPC -next diff     |     h -hilighting         |  r -restore buf C's old diff
+n,SPC -next diff     |     h -highlighting       |  r -restore buf C's old diff
     j -jump to diff  |     @ -auto-refinement    |  * -refine current region
    gx -goto X's point|    ## -ignore whitespace  |  ! -update diff regions
   C-l -recenter      | #f/#h -focus/hide regions |  + -combine diff regions
diff --git a/lisp/window.el b/lisp/window.el
index 0796b7fa493..35d80e30ee3 100644
--- a/lisp/window.el
+++ b/lisp/window.el
@@ -170,7 +170,7 @@ Applications should never rebind this variable.  To resize a
 window to a height less than the one specified here, an
 application should instead call `window-resize' with a non-nil
 IGNORE argument.  In order to have `split-window' make a window
-shorter, explictly specify the SIZE argument of that function."
+shorter, explicitly specify the SIZE argument of that function."
   :type 'integer
   :version "24.1"
   :group 'windows)
@@ -190,7 +190,7 @@ Applications should never rebind this variable.  To resize a
 window to a width less than the one specified here, an
 application should instead call `window-resize' with a non-nil
 IGNORE argument.  In order to have `split-window' make a window
-narrower, explictly specify the SIZE argument of that function."
+narrower, explicitly specify the SIZE argument of that function."
   :type 'integer
   :version "24.1"
   :group 'windows)