(cmd_error): Use NULL, not 0, as arg to cmd_error_internal.

(menu_bar_items): Likewise, for arg of current_minor_maps.
(record_char): Add cast.

diff --git a/src/keyboard.c b/src/keyboard.c
index afaab7bebe210b043e992cdc5b4b24ef81140529..c4e44ba9e5e62bfce671f8bce49fa482f816937f 100644 (file)
--- a/src/keyboard.c
+++ b/src/keyboard.c
@@ -843,7 +843,7 @@ cmd_error (data)
   old_length = Vprint_length;
   XSETFASTINT(Vprint_level, 10);
   XSETFASTINT(Vprint_length, 10);
-  cmd_error_internal (data, 0);
+  cmd_error_internal (data, NULL);
   Vprint_level = old_level;
   Vprint_length = old_length;
 
@@ -2118,7 +2118,7 @@ record_char (c)
          if (XUINT (c) < 0x100)
            putc (XINT (c), dribble);
          else
-           fprintf (dribble, " 0x%x", XUINT (c));
+           fprintf (dribble, " 0x%x", (int) XUINT (c));
        }
       else
        {
@@ -4358,7 +4358,7 @@ menu_bar_items (old)
     else
       {
        /* No, so use major and minor mode keymaps.  */
-       nmaps = current_minor_maps (0, &tmaps) + 2;
+       nmaps = current_minor_maps (NULL, &tmaps) + 2;
        maps = (Lisp_Object *) alloca (nmaps * sizeof (maps[0]));
        bcopy (tmaps, maps, (nmaps - 2) * sizeof (maps[0]));
 #ifdef USE_TEXT_PROPERTIES