upstream

1 files changed, 11 insertions, 16 deletions

diff --git a/src/keymap.c b/src/keymap.c
index 6c59a4a78d0..feaf0cfd961 100644
--- a/src/keymap.c
+++ b/src/keymap.c
@@ -92,7 +92,6 @@ static Lisp_Object where_is_cache;
 /* Which keymaps are reverse-stored in the cache.  */
 static Lisp_Object where_is_cache_keymaps;
 
-static Lisp_Object Flookup_key (Lisp_Object, Lisp_Object, Lisp_Object);
 static Lisp_Object store_in_keymap (Lisp_Object, Lisp_Object, Lisp_Object);
 
 static Lisp_Object define_as_prefix (Lisp_Object, Lisp_Object);
@@ -226,7 +225,7 @@ when reading a key-sequence to be looked-up in this keymap.  */)
    Fdefine_key should cause keymaps to be autoloaded.
 
    This function can GC when AUTOLOAD is non-zero, because it calls
-   do_autoload which can GC.  */
+   Fautoload_do_load which can GC.  */
 
 Lisp_Object
 get_keymap (Lisp_Object object, int error_if_not_keymap, int autoload)
@@ -260,7 +259,7 @@ get_keymap (Lisp_Object object, int error_if_not_keymap, int autoload)
                   struct gcpro gcpro1, gcpro2;
 
                   GCPRO2 (tem, object);
-                  do_autoload (tem, object);
+                  Fautoload_do_load (tem, object, Qnil);
                   UNGCPRO;
 
                   goto autoload_retry;
@@ -956,8 +955,6 @@ store_in_keymap (Lisp_Object keymap, register Lisp_Object idx, Lisp_Object def)
   return def;
 }
 
-static Lisp_Object Fcopy_keymap (Lisp_Object);
-
 static Lisp_Object
 copy_keymap_item (Lisp_Object elt)
 {
@@ -1481,7 +1478,7 @@ current_minor_maps (Lisp_Object **modeptr, Lisp_Object **mapptr)
                 /* Use malloc here.  See the comment above this function.
                    Avoid realloc here; it causes spurious traps on GNU/Linux [KFS] */
                 BLOCK_INPUT;
-                newmodes = (Lisp_Object *) malloc (allocsize);
+                newmodes = malloc (allocsize);
                 if (newmodes)
                   {
                     if (cmm_modes)
@@ -1493,7 +1490,7 @@ current_minor_maps (Lisp_Object **modeptr, Lisp_Object **mapptr)
                     cmm_modes = newmodes;
                   }
 
-                newmaps = (Lisp_Object *) malloc (allocsize);
+                newmaps = malloc (allocsize);
                 if (newmaps)
                   {
                     if (cmm_maps)
@@ -2013,9 +2010,7 @@ then the value includes only maps for prefixes that start with PREFIX.  */)
         return Qnil;
     }
   else
-    maps = Fcons (Fcons (Fmake_vector (make_number (0), Qnil),
-                         get_keymap (keymap, 1, 0)),
-                  Qnil);
+    maps = Fcons (Fcons (zero_vector, get_keymap (keymap, 1, 0)), Qnil);
 
   /* For each map in the list maps,
      look at any other maps it points to,
@@ -2926,7 +2921,7 @@ You type        Translation\n\
           if (!SYMBOLP (modes[i]))
             abort ();
 
-          p = title = (char *) alloca (42 + SCHARS (SYMBOL_NAME (modes[i])));
+          p = title = alloca (42 + SCHARS (SYMBOL_NAME (modes[i])));
           *p++ = '\f';
           *p++ = '\n';
           *p++ = '`';
@@ -3708,11 +3703,11 @@ syms_of_keymap (void)
   Ffset (intern_c_string ("Control-X-prefix"), control_x_map);
 
   exclude_keys
-    = pure_cons (pure_cons (make_pure_c_string ("DEL"), make_pure_c_string ("\\d")),
-                 pure_cons (pure_cons (make_pure_c_string ("TAB"), make_pure_c_string ("\\t")),
-                    pure_cons (pure_cons (make_pure_c_string ("RET"), make_pure_c_string ("\\r")),
-                           pure_cons (pure_cons (make_pure_c_string ("ESC"), make_pure_c_string ("\\e")),
-                                  pure_cons (pure_cons (make_pure_c_string ("SPC"), make_pure_c_string (" ")),
+    = pure_cons (pure_cons (build_pure_c_string ("DEL"), build_pure_c_string ("\\d")),
+                 pure_cons (pure_cons (build_pure_c_string ("TAB"), build_pure_c_string ("\\t")),
+                    pure_cons (pure_cons (build_pure_c_string ("RET"), build_pure_c_string ("\\r")),
+                           pure_cons (pure_cons (build_pure_c_string ("ESC"), build_pure_c_string ("\\e")),
+                                  pure_cons (pure_cons (build_pure_c_string ("SPC"), build_pure_c_string (" ")),
                                          Qnil)))));
   staticpro (&exclude_keys);