Spelling fixes.

5 files changed, 18 insertions, 19 deletions

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;
     }