(LIBS): Link in shell32.lib.

[bpt/emacs.git] / src / keymap.c

diff --git a/src/keymap.c b/src/keymap.c
index 04d2bb2..72dbb38 100644 (file)
--- a/src/keymap.c
+++ b/src/keymap.c
@@ -21,6 +21,9 @@ Boston, MA 02111-1307, USA.  */
 
 #include <config.h>
 #include <stdio.h>
+#ifdef STDC_HEADERS
+#include <stdlib.h>
+#endif
 #undef NULL
 #include "lisp.h"
 #include "commands.h"
@@ -102,7 +105,6 @@ static Lisp_Object define_as_prefix ();
 static Lisp_Object describe_buffer_bindings ();
 static void describe_command (), describe_translation ();
 static void describe_map ();
-Lisp_Object Fcopy_keymap ();
 \f
 /* Keymap object support - constructors and predicates.                        */
 
@@ -368,10 +370,10 @@ fix_submap_inheritance (map, event, submap)
   /* SUBMAP is a cons that we found as a key binding.
      Discard the other things found in a menu key binding.  */
 
-  if CONSP (submap)
+  if (CONSP (submap))
     {
       /* May be an old format menu item */
-      if STRINGP (XCONS (submap)->car)
+      if (STRINGP (XCONS (submap)->car))
        {
          submap = XCONS (submap)->cdr;
          /* Also remove a menu help string, if any,
@@ -2592,9 +2594,8 @@ describe_command (definition)
   if (SYMBOLP (definition))
     {
       XSETSTRING (tem1, XSYMBOL (definition)->name);
-      insert_string ("`");
       insert1 (tem1);
-      insert_string ("'\n");
+      insert_string ("\n");
     }
   else if (STRINGP (definition) || VECTORP (definition))
     insert_string ("Keyboard Macro\n");
@@ -3168,6 +3169,7 @@ Return list of symbols found.")
   return apropos_accumulate;
 }
 \f
+void
 syms_of_keymap ()
 {
   Lisp_Object tem;
@@ -3305,6 +3307,7 @@ and applies even for keys that have ordinary bindings.");
   defsubr (&Sapropos_internal);
 }
 
+void
 keys_of_keymap ()
 {
   Lisp_Object tem;