# HG changeset patch
# User Richard M. Stallman <rms@gnu.org>
# Date 819952625 0
# Node ID 8389738a7792c1b15ae241f27cac2f66812acdd9
# Parent  8b143e9a5394c54604894eb549e1439328e5bc14
(read_char_x_menu_prompt): HAVE_X_MENU renamed to HAVE_MENUS.

(Fexecute_extended_command): Nice error if empty cmd name.

diff -r 8b143e9a5394 -r 8389738a7792 src/keyboard.c
--- a/src/keyboard.c	Tue Dec 26 04:35:42 1995 +0000
+++ b/src/keyboard.c	Tue Dec 26 04:37:05 1995 +0000
@@ -4925,7 +4925,7 @@
   if (mapno >= nmaps)
     return Qnil;
 
-#if (defined (HAVE_X_WINDOWS) && defined (HAVE_X_MENU)) || defined (MSDOS) || defined (HAVE_NTGUI)
+#ifdef HAVE_MENUS
   /* If we got to this point via a mouse click,
      use a real menu for mouse selection.  */
   if (EVENT_HAS_PARAMETERS (prev_event)
@@ -4975,7 +4975,7 @@
 	*used_mouse_menu = 1;
       return value;
     }
-#endif /* (HAVE_X_WINDOWS && HAVE_X_MENU) || MSDOS || HAVE_NTGUI */
+#endif /* HAVE_MENUS */
   return Qnil ;
 }
 
@@ -6492,6 +6492,9 @@
 			       Vobarray, Qcommandp,
 			       Qt, Qnil, Qextended_command_history);
 
+  if (STRINGP (function) && XSTRING (function)->size == 0)
+    error ("No command name given");
+
   /* Set this_command_keys to the concatenation of saved_keys and
      function, followed by a RET.  */
   {