mirror of
git://git.sv.gnu.org/emacs.git
synced 2026-02-23 21:37:34 +00:00
(read_char_menu_prompt): Use X menu code if HAVE_X_WINDOWS and not NO_X_MENU.
This commit is contained in:
parent
2c44309ae2
commit
72cea080f2
1 changed files with 4 additions and 2 deletions
|
|
@ -2322,7 +2322,8 @@ read_char_menu_prompt (nmaps, maps, prev_event, used_mouse_menu)
|
|||
if (NILP (name))
|
||||
return Qnil;
|
||||
|
||||
#ifdef HAVE_X_MENU
|
||||
#ifdef HAVE_X_WINDOW
|
||||
#ifndef NO_X_MENU
|
||||
/* If we got to this point via a mouse click,
|
||||
use a real menu for mouse selection. */
|
||||
if (XTYPE (prev_event) == Lisp_Cons)
|
||||
|
|
@ -2344,7 +2345,8 @@ read_char_menu_prompt (nmaps, maps, prev_event, used_mouse_menu)
|
|||
*used_mouse_menu = 1;
|
||||
return value;
|
||||
}
|
||||
#endif /* HAVE_X_MENU */
|
||||
#endif /* not NO_X_MENU */
|
||||
#endif /* HAVE_X_WINDOW */
|
||||
|
||||
/* Prompt string always starts with map's prompt, and a space. */
|
||||
strcpy (menu, XSTRING (name)->data);
|
||||
|
|
|
|||
Loading…
Reference in a new issue