Update copyright year to 2015

[gnu-emacs] / src / keymap.c

diff --git a/src/keymap.c b/src/keymap.c
index d633bdcaae78ad49d967329e6afc8f5dd12c4635..ab21a2262719a03752f37884a90a9cdf95ccc0d0 100644 (file)
--- a/src/keymap.c
+++ b/src/keymap.c
@@ -1,5 +1,5 @@
 /* Manipulation of keymaps
-   Copyright (C) 1985-1988, 1993-1995, 1998-2014 Free Software
+   Copyright (C) 1985-1988, 1993-1995, 1998-2015 Free Software
    Foundation, Inc.
 
 This file is part of GNU Emacs.
@@ -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));
     }