Spelling fixes.

* mail/unrmail.el (unrmail-mbox-format): Choice is mboxo, not mboxro.
* woman.el (woman-mark-horizontal-position):
Rename from woman-mark-horizonal-position.  Use changed.

20 files changed, 33 insertions, 27 deletions

diff --git a/doc/misc/autotype.texi b/doc/misc/autotype.texi
index aacf4fad83e..7ca860486c2 100644
--- a/doc/misc/autotype.texi
+++ b/doc/misc/autotype.texi
@@ -302,7 +302,7 @@ of the same name as the command and can thus be overridden from your
   Various characters usually appear in pairs.  When, for example, you insert
 an open parenthesis, no matter whether you are programming or writing prose,
 you will surely enter a closing one later.  By entering both at the same time
-and leaving the cursor inbetween, Emacs can guarantee you that such
+and leaving the cursor in between, Emacs can guarantee you that such
 parentheses are always balanced.  And if you have a non-qwerty keyboard, where
 typing some of the stranger programming language symbols makes you bend your
 fingers backwards, this can be quite relieving too.
diff --git a/doc/misc/calc.texi b/doc/misc/calc.texi
index 10c863a9513..1700aee9dc1 100644
--- a/doc/misc/calc.texi
+++ b/doc/misc/calc.texi
@@ -28053,8 +28053,8 @@ radiation related to the cesium-133 atom.  The only SI unit that is not
 based on a fundamental physical process (although there are efforts to
 change this) is the kilogram, which was originally defined as the mass
 of one liter of water, but is now defined as the mass of the
-International Prototype Kilogram (IPK), a cylinder of platinum-iridium
-kept at the Bureau International des Poids et Mesures in S@`evres,
+international prototype of the kilogram (IPK), a cylinder of platinum-iridium
+kept at the Bureau international des poids et mesures in S@`evres,
 France.  (There are several copies of the IPK throughout the world.)
 The British imperial units, once defined in terms of physical objects,
 were redefined in 1963 in terms of SI units.  The US customary units,
diff --git a/doc/misc/gnus.texi b/doc/misc/gnus.texi
index 376d2a0ad26..6ad0c26f9ac 100644
--- a/doc/misc/gnus.texi
+++ b/doc/misc/gnus.texi
@@ -10229,8 +10229,8 @@ summary buffer, point will just move to this article.
 If given a positive numerical prefix, fetch that many articles back into
 the ancestry.  If given a negative numerical prefix, fetch just that
 ancestor.  So if you say @kbd{3 ^}, Gnus will fetch the parent, the
-grandparent and the grandgrandparent of the current article.  If you say
-@kbd{-3 ^}, Gnus will only fetch the grandgrandparent of the current
+grandparent and the great-grandparent of the current article.  If you say
+@kbd{-3 ^}, Gnus will only fetch the great-grandparent of the current
 article.
 
 @item A R (Summary)
diff --git a/doc/misc/idlwave.texi b/doc/misc/idlwave.texi
index a6940781ca7..c4719dcd039 100644
--- a/doc/misc/idlwave.texi
+++ b/doc/misc/idlwave.texi
@@ -591,7 +591,7 @@ slightly from the margin and use only 3 spaces as indentation between
 
 Restart Emacs, and re-indent the program we developed in the first part
 of this tutorial with @kbd{C-c h} and @kbd{C-M-\}.  You may want to keep
-these lines in @file{.emacs}, with values adjusted to your likings.  If
+these lines in @file{.emacs}, with values adjusted to your liking.  If
 you want to get more information about any of these variables, type,
 e.g., @kbd{C-h v idlwave-main-block-indent @key{RET}}.  To find which
 variables can be customized, look for items marked @samp{User Option:}
diff --git a/etc/ORG-NEWS b/etc/ORG-NEWS
index a0ed5c9e338..c74506ce3ac 100644
--- a/etc/ORG-NEWS
+++ b/etc/ORG-NEWS
@@ -1062,7 +1062,7 @@ See http://orgmode.org/elpa/
    | =k=             |        | [[doc::org-agenda-capture][org-agenda-capture]]          |
    | C-c ,           | ,      | [[doc::org-priority][org-priority]]                |
 
-** New package and Babel langage
+** New package and Babel language
 
 *** =org-eshell.el= by Konrad Hinsen is now in Org
 
diff --git a/etc/echo.msg b/etc/echo.msg
index 00a94b7ae97..53d051f85ef 100644
--- a/etc/echo.msg
+++ b/etc/echo.msg
@@ -69,7 +69,7 @@ DESCRIPTION
 
      -i   emulate IBM OS/VU (recursive universes not supported)
 
-     -I   emulate IBM VTOS 3.7.6 (chronosynclastic infundibulae
+     -I   emulate IBM VTOS 3.7.6 (chronosynclastic infundibula
           supported with restrictions documented in IBM VTOS
 
 
@@ -207,4 +207,3 @@ AUTHOR
 
 
 Printed 10/28/85         18 January 1983                        3
-
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 7fecb6b58c3..aae582bfff2 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,10 @@
+2014-01-10  Paul Eggert  <eggert@cs.ucla.edu>
+
+        Spelling fixes.
+        * mail/unrmail.el (unrmail-mbox-format): Choice is mboxo, not mboxro.
+        * woman.el (woman-mark-horizontal-position):
+        Rename from woman-mark-horizonal-position.  Use changed.
+
 2014-01-10  Glenn Morris  <rgm@gnu.org>
 
         * info.el (info-initialize): If running uninstalled, ensure our
diff --git a/lisp/cedet/semantic/bovine/c.el b/lisp/cedet/semantic/bovine/c.el
index 8627abc5b9e..e4f239b14a9 100644
--- a/lisp/cedet/semantic/bovine/c.el
+++ b/lisp/cedet/semantic/bovine/c.el
@@ -504,7 +504,7 @@ code to parse."
     (let ((eval-form (eval parsedtokelist)))
       (if (or (not eval-form)
               (and (numberp eval-form)
-                   (equal eval-form 0)));; ifdefline resulted in false
+                   (equal eval-form 0)));; ifdef line resulted in false
 
         ;; The if indicates to skip this preprocessor section
         (let ((pt nil))
@@ -1242,7 +1242,7 @@ Use `semantic-analyze-current-tag' to debug this fcn."
       (setq scope (semantic-calculate-scope))
 
       (setq allhits (semantic--analyze-refs-full-lookup tag scope t))
-      
+
       (when (or (zerop (semanticdb-find-result-length allhits))
                 (and (= (semanticdb-find-result-length allhits) 1)
                      (eq (car (semanticdb-find-result-nth allhits 0)) tag)))
diff --git a/lisp/cedet/srecode/map.el b/lisp/cedet/srecode/map.el
index fc286c915dc..31ea7101504 100644
--- a/lisp/cedet/srecode/map.el
+++ b/lisp/cedet/srecode/map.el
@@ -80,7 +80,7 @@ Each app keys to an alist of files and modes (as above.)")
     ans))
 
 (defmethod srecode-map-entry-for-app ((map srecode-map) app)
-  "Return the entry in MAP for APP'lication."
+  "Return the entry in MAP for APP."
   (assoc app (oref map apps))
   )
 
@@ -137,7 +137,7 @@ Return non-nil if the MAP was changed."
     dirty))
 
 (defmethod srecode-map-delete-file-entry-from-app ((map srecode-map) file app)
-  "Delete from MAP the FILE entry within the APP'lication."
+  "Delete from MAP the FILE entry within the APP."
   (let* ((appe (srecode-map-entry-for-app map app))
          (fentry (assoc file (cdr appe))))
     (setcdr appe (delete fentry (cdr appe))))
diff --git a/lisp/emacs-lisp/eieio-opt.el b/lisp/emacs-lisp/eieio-opt.el
index 127c25540fa..8e43eff2b83 100644
--- a/lisp/emacs-lisp/eieio-opt.el
+++ b/lisp/emacs-lisp/eieio-opt.el
@@ -124,7 +124,7 @@ If CLASS is actually an object, then also display current values of that object.
   ;; Describe all the methods specific to this class.
   (let ((methods (eieio-all-generic-functions class))
         (type [":STATIC" ":BEFORE" ":PRIMARY" ":AFTER"])
-        counter doc argshl dochl)
+        counter doc)
     (when methods
       (insert (propertize "Specialized Methods:\n\n" 'face 'bold))
       (while methods
diff --git a/lisp/mail/uce.el b/lisp/mail/uce.el
index c4816209d34..a6e2513c8c9 100644
--- a/lisp/mail/uce.el
+++ b/lisp/mail/uce.el
@@ -279,7 +279,7 @@ You might need to set `uce-mail-reader' before using this."
         (goto-char (point-min)))
       ;; Now find the mail hub that first accepted this message.
       ;; This should try to find the last Received: header.
-      ;; Sometimes there may be other headers inbetween Received: headers.
+      ;; Sometimes there may be other headers in between Received: headers.
       (cond ((eq uce-mail-reader 'gnus)
              ;; Does Gnus always have Lines: in the end?
              (re-search-forward "^Lines:")
diff --git a/lisp/mail/unrmail.el b/lisp/mail/unrmail.el
index e1559578dee..8a9d5106176 100644
--- a/lisp/mail/unrmail.el
+++ b/lisp/mail/unrmail.el
@@ -52,12 +52,12 @@ Therefore any lines in the message bodies that start with \"From \"
 must be quoted.  The `mboxo' format just prepends a \">\" to such lines.
 This is not reversible, because given a line starting with \">From \" in
 an mboxo file, it is not possible to know whether the original had a \">\"
-or not.  The `mxbord' format avoids this by also quoting \">From \" as
+or not.  The `mboxrd' format avoids this by also quoting \">From \" as
 \">>From \", and so on.  For this reason, mboxrd is recommended.
 
 See also `rmail-mbox-format'."
   :type '(choice (const mboxrd)
-                 (const mboxro))
+                 (const mboxo))
   :version "24.4"
   :group 'rmail-files)
 
diff --git a/lisp/progmodes/verilog-mode.el b/lisp/progmodes/verilog-mode.el
index 6408afb6af2..ee5f8cb046b 100644
--- a/lisp/progmodes/verilog-mode.el
+++ b/lisp/progmodes/verilog-mode.el
@@ -10509,8 +10509,8 @@ DIFFPT.  This function is called via `verilog-diff-function'."
 
 (defun verilog-diff-auto ()
   "Expand AUTOs in a temporary buffer and indicate any change.
-Whitespace differences are ignored to determine identicalness, but
-once a difference is detected, whitespace differences may be shown.
+Whitespace is ignored when detecting differences, but once a
+difference is detected, whitespace differences may be shown.
 
 To call this from the command line, see \\[verilog-batch-diff-auto].
 
diff --git a/lisp/term/README b/lisp/term/README
index 3f8ff8c0d62..b8756c3873d 100644
--- a/lisp/term/README
+++ b/lisp/term/README
@@ -55,7 +55,7 @@ are listed in src/term.c; look for the string `keys' in that file.
 terminal mode as on an X console.  If there are differences, you can bet
 they'll frustrate you after you've forgotten about them.
 
-   For another, the X keysms provide a standard set of names that Emacs knows
+   For another, the X keysyms provide a standard set of names that Emacs knows
 about.  It tries to bind many of them to useful things at startup, before your
 .emacs is read (so you can override them).  In some ways, the X keysym standard
 is a admittedly poor one; it's incomplete, and not well matched to the set of
diff --git a/lisp/textmodes/tex-mode.el b/lisp/textmodes/tex-mode.el
index 3d53dfb765f..a1a3e16a5aa 100644
--- a/lisp/textmodes/tex-mode.el
+++ b/lisp/textmodes/tex-mode.el
@@ -2803,7 +2803,7 @@ There might be text before point."
           (t
            (let ((col (current-column)))
              (if (or (not (eq (char-syntax (or (char-after pos) ?\s)) ?\())
-                     ;; Can't be an arg if there's an empty line inbetween.
+                     ;; Can't be an arg if there's an empty line in between.
                      (save-excursion (re-search-forward "^[ \t]*$" pos t)))
                  ;; If the first char was not an open-paren, there's
                  ;; a risk that this is really not an argument to the
diff --git a/lisp/woman.el b/lisp/woman.el
index 87ebf415a02..7100e4b61cf 100644
--- a/lisp/woman.el
+++ b/lisp/woman.el
@@ -2300,7 +2300,7 @@ Currently set only from '\" t in the first line of the source file.")
 
     ;; Process \k escapes BEFORE changing tab width (?):
     (goto-char from)
-    (woman-mark-horizonal-position)
+    (woman-mark-horizontal-position)
 
     ;; Set buffer-local variables:
     (setq fill-column woman-fill-column
@@ -3452,7 +3452,7 @@ Format paragraphs upto TO.  Supports special chars.
 Each element has the form (KEY VALUE . INC) -- inc may be nil.
 Also bound locally in `woman2-roff-buffer'.")
 
-(defun woman-mark-horizonal-position ()
+(defun woman-mark-horizontal-position ()
   "\\kx -- Store current horizontal position in INPUT LINE in register x."
   (while (re-search-forward "\\\\k\\(.\\)" nil t)
     (goto-char (match-beginning 0))
diff --git a/msdos/inttypes.h b/msdos/inttypes.h
index 47cfdaeea33..9f59d4e1a2e 100644
--- a/msdos/inttypes.h
+++ b/msdos/inttypes.h
@@ -1,4 +1,4 @@
-/* Replacement inntypes.h file for building GNU Emacs on MS-DOS with DJGPP.
+/* Replacement inttypes.h file for building GNU Emacs on MS-DOS with DJGPP.
 
 Copyright (C) 2011-2014 Free Software Foundation, Inc.
 
diff --git a/nt/inc/inttypes.h b/nt/inc/inttypes.h
index 9dfc7feda02..e6d18f3861f 100644
--- a/nt/inc/inttypes.h
+++ b/nt/inc/inttypes.h
@@ -1,4 +1,4 @@
-/* Replacement inntypes.h file for building GNU Emacs on Windows with MSVC.
+/* Replacement inttypes.h file for building GNU Emacs on Windows with MSVC.
 
 Copyright (C) 2011-2014 Free Software Foundation, Inc.
 
diff --git a/src/font.c b/src/font.c
index cb0a28a524b..fa097c7d7e6 100644
--- a/src/font.c
+++ b/src/font.c
@@ -4429,7 +4429,7 @@ where
   LANGSYS is a symbol specifying a langsys tag of OpenType,
   GSUB and GPOS, if non-nil, are lists of symbols specifying feature tags.
 
-If LANGYS is nil, the default langsys is selected.
+If LANGSYS is nil, the default langsys is selected.
 
 The features are applied in the order they appear in the list.  The
 symbol `*' means to apply all available features not present in this
diff --git a/test/indent/pascal.pas b/test/indent/pascal.pas
index 1ae22d369d1..4b3be7cf57c 100644
--- a/test/indent/pascal.pas
+++ b/test/indent/pascal.pas
@@ -688,7 +688,7 @@ var
       NoSound;
       RestoreTerminalClearCRT;
       WriteLn (StdErr, 'You''re trying to kill me. Since I have break checking turned off,');
-      WriteLn (StdErr, 'I''m not dying, but I''ll do you a favour and terminate now.');
+      WriteLn (StdErr, 'I''m not dying, but I''ll do you a favor and terminate now.');
       Halt (3)
    end;