Mercurial > emacs
comparison src/keyboard.c @ 13864:8389738a7792
(read_char_x_menu_prompt): HAVE_X_MENU renamed to HAVE_MENUS.
(Fexecute_extended_command): Nice error if empty cmd name.
author | Richard M. Stallman <rms@gnu.org> |
---|---|
date | Tue, 26 Dec 1995 04:37:05 +0000 |
parents | 7d0b87f737f9 |
children | 621a575db6f7 |
comparison
equal
deleted
inserted
replaced
13863:8b143e9a5394 | 13864:8389738a7792 |
---|---|
4923 | 4923 |
4924 /* If we don't have any menus, just read a character normally. */ | 4924 /* If we don't have any menus, just read a character normally. */ |
4925 if (mapno >= nmaps) | 4925 if (mapno >= nmaps) |
4926 return Qnil; | 4926 return Qnil; |
4927 | 4927 |
4928 #if (defined (HAVE_X_WINDOWS) && defined (HAVE_X_MENU)) || defined (MSDOS) || defined (HAVE_NTGUI) | 4928 #ifdef HAVE_MENUS |
4929 /* If we got to this point via a mouse click, | 4929 /* If we got to this point via a mouse click, |
4930 use a real menu for mouse selection. */ | 4930 use a real menu for mouse selection. */ |
4931 if (EVENT_HAS_PARAMETERS (prev_event) | 4931 if (EVENT_HAS_PARAMETERS (prev_event) |
4932 && !EQ (XCONS (prev_event)->car, Qmenu_bar)) | 4932 && !EQ (XCONS (prev_event)->car, Qmenu_bar)) |
4933 { | 4933 { |
4973 value = Qt; | 4973 value = Qt; |
4974 if (used_mouse_menu) | 4974 if (used_mouse_menu) |
4975 *used_mouse_menu = 1; | 4975 *used_mouse_menu = 1; |
4976 return value; | 4976 return value; |
4977 } | 4977 } |
4978 #endif /* (HAVE_X_WINDOWS && HAVE_X_MENU) || MSDOS || HAVE_NTGUI */ | 4978 #endif /* HAVE_MENUS */ |
4979 return Qnil ; | 4979 return Qnil ; |
4980 } | 4980 } |
4981 | 4981 |
4982 static Lisp_Object | 4982 static Lisp_Object |
4983 read_char_minibuf_menu_prompt (commandflag, nmaps, maps) | 4983 read_char_minibuf_menu_prompt (commandflag, nmaps, maps) |
6490 history list. */ | 6490 history list. */ |
6491 function = Fcompleting_read (build_string (buf), | 6491 function = Fcompleting_read (build_string (buf), |
6492 Vobarray, Qcommandp, | 6492 Vobarray, Qcommandp, |
6493 Qt, Qnil, Qextended_command_history); | 6493 Qt, Qnil, Qextended_command_history); |
6494 | 6494 |
6495 if (STRINGP (function) && XSTRING (function)->size == 0) | |
6496 error ("No command name given"); | |
6497 | |
6495 /* Set this_command_keys to the concatenation of saved_keys and | 6498 /* Set this_command_keys to the concatenation of saved_keys and |
6496 function, followed by a RET. */ | 6499 function, followed by a RET. */ |
6497 { | 6500 { |
6498 struct Lisp_String *str; | 6501 struct Lisp_String *str; |
6499 Lisp_Object *keys; | 6502 Lisp_Object *keys; |