Spelling fixes.

11 files changed, 27 insertions, 28 deletions

diff --git a/admin/versioning b/admin/versioning
index 2b4d499fc0a..da547ee94ca 100644
--- a/admin/versioning
+++ b/admin/versioning
@@ -6,7 +6,7 @@ years.  This file defines the current method, explains why it was
 chosen, and lightly documents the previous schemes.  It was prompted
 by http://lists.gnu.org/archive/html/emacs-devel/2014-09/msg00872.html.
 
-Releated info:
+Related info:
 - [[file:FOR-RELEASE][FOR-RELEASE]]
 - [[file:make-tarball.txt][make-tarball.txt]]
 
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 2094fdc30cc..b07a6b0d851 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -3305,7 +3305,7 @@
         outside of ignored environments.
         (tildify-build-regexp): Remove function since it is now
         incorporated in `tildify-foreach-region-outside-env' where it is
-        optimised and simplified by the use of `mapconcat'.
+        optimized and simplified by the use of `mapconcat'.
         (tildify-tildify): Return number of substitutions made so that…
         (tildify-count): …can be removed.
         (tildify-find-env): Accept a new PAIRS argument which was
@@ -3318,7 +3318,7 @@
         and instead using or.
 
         * textmodes/tildify.el (tildify-ignored-environments-alist):
-        Optimise environments regexes
+        Optimize environments regexes
 
         Each time beginning of an environment to ignore is found,
         `tildify-find-env' needs to identify regexp for the ending
@@ -3400,7 +3400,7 @@
 
         The most trivial fix would be to replace `expression' in the
         true-part of the if-statement with `aux', but instead, this commit
-        optimises `tildify-find-env' by changing it to use `mapconcat'
+        optimizes `tildify-find-env' by changing it to use `mapconcat'
         rather than open-coded while-loop.
 
 2014-06-05  Mario Lang  <mlang@delysid.org>
@@ -16622,7 +16622,7 @@
 
 2013-06-04  Alan Mackenzie  <acm@muc.de>
 
-        Remove faulty optimisation from indentation calculation.
+        Remove faulty optimization from indentation calculation.
         * progmodes/cc-engine.el (c-guess-basic-syntax): Don't calculate
         search limit based on 2000 characters back from indent-point.
 
diff --git a/lisp/org/org.el b/lisp/org/org.el
index 238f47fc1ad..05a26a80cbe 100644
--- a/lisp/org/org.el
+++ b/lisp/org/org.el
@@ -7571,7 +7571,7 @@ headline or the item and create a new headline/item with the text
 in the current line after point \(see `org-M-RET-may-split-line'
 on how to modify this behavior).
 
-With one universal prefirx argument, set the user option
+With one universal prefix argument, set the user option
 `org-insert-heading-respect-content' to t for the duration of
 the command.  This modifies the behavior described above in this
 ways: on list items and at the beginning of normal lines, force
diff --git a/lisp/progmodes/cc-engine.el b/lisp/progmodes/cc-engine.el
index d17be71a2d1..9a2531d1e99 100644
--- a/lisp/progmodes/cc-engine.el
+++ b/lisp/progmodes/cc-engine.el
@@ -5162,7 +5162,7 @@ comment at the start of cc-engine.el for more info."
     ;; Now loop, one decl spot per iteration.  We already have the first
     ;; match in `cfd-match-pos'.
     (while (progn
-             ;; Go foward over "false matches", one per iteration.
+             ;; Go forward over "false matches", one per iteration.
              (while (and
                      (< cfd-match-pos cfd-limit)
 
diff --git a/lisp/progmodes/cc-langs.el b/lisp/progmodes/cc-langs.el
index 16f1dbfc6d6..bab928ac5dd 100644
--- a/lisp/progmodes/cc-langs.el
+++ b/lisp/progmodes/cc-langs.el
@@ -1591,7 +1591,7 @@ properly."
 ;; The Emacs variables beginning-of-defun-function and end-of-defun-function
 ;; will be set so that commands like `mark-defun' and `narrow-to-defun' work
 ;; right.  In older Emacsen, the key sequences C-M-a and C-M-e are, however,
-;; bound directly to the CC Mode functions, allowing optimisation for large n.
+;; bound directly to the CC Mode functions, allowing optimization for large n.
 ;; From Emacs 23, this isn't necessary any more, since n is passed to the two
 ;; functions.
 (c-lang-defconst beginning-of-defun-function
diff --git a/src/ChangeLog b/src/ChangeLog
index 46f50364890..e06406e3af0 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -10445,7 +10445,7 @@
         (imagemagick_get_animation_cache): Fix a double-free error.
         (imagemagick_load_image): Remove the ping_wand code, which only
         apparently saved time on invalid animated images, and slowed down
-        everything else.  Optimise for the common case.
+        everything else.  Optimize for the common case.
 
 2013-08-16  Xue Fuqiao  <xfq.free@gmail.com>
 
diff --git a/src/font.c b/src/font.c
index d73aed76d40..08a25455cf8 100644
--- a/src/font.c
+++ b/src/font.c
@@ -1184,14 +1184,14 @@ font_parse_xlfd (char *name, ptrdiff_t len, Lisp_Object font)
           val = prop[XLFD_ENCODING_INDEX];
           if (! NILP (val))
             {
-              AUTO_STRING (stardash, "*-");
-              val = concat2 (stardash, SYMBOL_NAME (val));
+              AUTO_STRING (star_dash, "*-");
+              val = concat2 (star_dash, SYMBOL_NAME (val));
             }
         }
       else if (NILP (prop[XLFD_ENCODING_INDEX]))
         {
-          AUTO_STRING (dashstar, "-*");
-          val = concat2 (SYMBOL_NAME (val), dashstar);
+          AUTO_STRING (dash_star, "-*");
+          val = concat2 (SYMBOL_NAME (val), dash_star);
         }
       else
         {
@@ -5028,7 +5028,7 @@ font_add_log (const char *action, Lisp_Object arg, Lisp_Object result)
   if (FONTP (arg))
     {
       Lisp_Object tail, elt;
-      AUTO_STRING (equalstr, "=");
+      AUTO_STRING (equal, "=");
 
       val = Ffont_xlfd_name (arg, Qt);
       for (tail = AREF (arg, FONT_EXTRA_INDEX); CONSP (tail);
@@ -5038,16 +5038,15 @@ font_add_log (const char *action, Lisp_Object arg, Lisp_Object result)
           if (EQ (XCAR (elt), QCscript)
               && SYMBOLP (XCDR (elt)))
             val = concat3 (val, SYMBOL_NAME (QCscript),
-                           concat2 (equalstr, SYMBOL_NAME (XCDR (elt))));
+                           concat2 (equal, SYMBOL_NAME (XCDR (elt))));
           else if (EQ (XCAR (elt), QClang)
                    && SYMBOLP (XCDR (elt)))
             val = concat3 (val, SYMBOL_NAME (QClang),
-                           concat2 (equalstr, SYMBOL_NAME (XCDR (elt))));
+                           concat2 (equal, SYMBOL_NAME (XCDR (elt))));
           else if (EQ (XCAR (elt), QCotf)
                    && CONSP (XCDR (elt)) && SYMBOLP (XCAR (XCDR (elt))))
             val = concat3 (val, SYMBOL_NAME (QCotf),
-                           concat2 (equalstr,
-                                    SYMBOL_NAME (XCAR (XCDR (elt)))));
+                           concat2 (equal, SYMBOL_NAME (XCAR (XCDR (elt)))));
         }
       arg = val;
     }
diff --git a/src/keymap.c b/src/keymap.c
index d633bdcaae7..c7c7d196c22 100644
--- a/src/keymap.c
+++ b/src/keymap.c
@@ -1339,8 +1339,8 @@ silly_event_symbol_error (Lisp_Object c)
       *p = 0;
 
       c = reorder_modifiers (c);
-      AUTO_STRING (new_modstring, new_mods);
-      keystring = concat2 (new_modstring, XCDR (assoc));
+      AUTO_STRING (new_mods_string, new_mods);
+      keystring = concat2 (new_mods_string, XCDR (assoc));
 
       error ("To bind the key %s, use [?%s], not [%s]",
              SDATA (SYMBOL_NAME (c)), SDATA (keystring),
@@ -2245,9 +2245,9 @@ around function keys and event symbols.  */)
   if (CONSP (key) && INTEGERP (XCAR (key)) && INTEGERP (XCDR (key)))
     /* An interval from a map-char-table.  */
     {
-      AUTO_STRING (dotdot, "..");
+      AUTO_STRING (dot_dot, "..");
       return concat3 (Fsingle_key_description (XCAR (key), no_angles),
-                      dotdot,
+                      dot_dot,
                       Fsingle_key_description (XCDR (key), no_angles));
     }
 
diff --git a/src/lread.c b/src/lread.c
index 59af12cf6da..171a51acb3f 100644
--- a/src/lread.c
+++ b/src/lread.c
@@ -3661,8 +3661,8 @@ read_list (bool flag, Lisp_Object readcharfun)
                We don't use Fexpand_file_name because that would make
                the directory absolute now.  */
             {
-              AUTO_STRING (dotdotlisp, "../lisp/");
-              elt = concat2 (dotdotlisp, Ffile_name_nondirectory (elt));
+              AUTO_STRING (dot_dot_lisp, "../lisp/");
+              elt = concat2 (dot_dot_lisp, Ffile_name_nondirectory (elt));
             }
         }
       else if (EQ (elt, Vload_file_name)
diff --git a/src/process.c b/src/process.c
index f767ae05e96..0c36f8e18c3 100644
--- a/src/process.c
+++ b/src/process.c
@@ -4099,9 +4099,9 @@ server_accept_connection (Lisp_Object server, int channel)
 #endif
     default:
       caller = Fnumber_to_string (make_number (connect_counter));
-      AUTO_STRING (space_lessthan, " <");
-      AUTO_STRING (greaterthan, ">");
-      caller = concat3 (space_lessthan, caller, greaterthan);
+      AUTO_STRING (space_less_than, " <");
+      AUTO_STRING (greater_than, ">");
+      caller = concat3 (space_less_than, caller, greater_than);
       break;
     }
 
diff --git a/test/ChangeLog b/test/ChangeLog
index 5c2032e7e85..1ef5ee99775 100644
--- a/test/ChangeLog
+++ b/test/ChangeLog
@@ -313,7 +313,7 @@
 
 2014-06-05  Michal Nazarewicz  <mina86@mina86.com>
 
-        * automated/tildify-tests.el (tildify-test--test): Optimise the test
+        * automated/tildify-tests.el (tildify-test--test): Optimize the test
         slightly by reusing the same temporary buffer across multiple test
         cases.