Commit 1f5b1641 authored by Richard M. Stallman's avatar Richard M. Stallman
Browse files

(read_char_x_menu_prompt): HAVE_X_MENU renamed to HAVE_MENUS.

(Fexecute_extended_command): Nice error if empty cmd name.
parent 6ef338b7
...@@ -4925,7 +4925,7 @@ read_char_x_menu_prompt (nmaps, maps, prev_event, used_mouse_menu) ...@@ -4925,7 +4925,7 @@ read_char_x_menu_prompt (nmaps, maps, prev_event, used_mouse_menu)
if (mapno >= nmaps) if (mapno >= nmaps)
return Qnil; 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, /* If we got to this point via a mouse click,
use a real menu for mouse selection. */ use a real menu for mouse selection. */
if (EVENT_HAS_PARAMETERS (prev_event) if (EVENT_HAS_PARAMETERS (prev_event)
...@@ -4975,7 +4975,7 @@ read_char_x_menu_prompt (nmaps, maps, prev_event, used_mouse_menu) ...@@ -4975,7 +4975,7 @@ read_char_x_menu_prompt (nmaps, maps, prev_event, used_mouse_menu)
*used_mouse_menu = 1; *used_mouse_menu = 1;
return value; return value;
} }
#endif /* (HAVE_X_WINDOWS && HAVE_X_MENU) || MSDOS || HAVE_NTGUI */ #endif /* HAVE_MENUS */
return Qnil ; return Qnil ;
} }
...@@ -6492,6 +6492,9 @@ DEFUN ("execute-extended-command", Fexecute_extended_command, Sexecute_extended_ ...@@ -6492,6 +6492,9 @@ DEFUN ("execute-extended-command", Fexecute_extended_command, Sexecute_extended_
Vobarray, Qcommandp, Vobarray, Qcommandp,
Qt, Qnil, Qextended_command_history); 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 /* Set this_command_keys to the concatenation of saved_keys and
function, followed by a RET. */ function, followed by a RET. */
{ {
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment