diff options
| author | Richard M. Stallman <rms@gnu.org> | 1992-09-14 22:10:55 +0000 |
|---|---|---|
| committer | Richard M. Stallman <rms@gnu.org> | 1992-09-14 22:10:55 +0000 |
| commit | 72cea080f2fc1a97763272f1f044b240e6e65161 (patch) | |
| tree | e8b298843bc771274b30c1564d18580e6ec51ec8 | |
| parent | 2c44309ae20a22e3e7eb5790ba851482a0e356e8 (diff) | |
| download | emacs-72cea080f2fc1a97763272f1f044b240e6e65161.tar.gz | |
(read_char_menu_prompt): Use X menu code if HAVE_X_WINDOWS and not NO_X_MENU.
| -rw-r--r-- | src/keyboard.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/keyboard.c b/src/keyboard.c index 5a2e635f843..e1124a4facd 100644 --- a/src/keyboard.c +++ b/src/keyboard.c @@ -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); |