changeset 1140:5c36807e445c

(read_char_menu_prompt): Use X menu code if HAVE_X_WINDOWS and not NO_X_MENU.
author Richard M. Stallman <rms@gnu.org>
date Mon, 14 Sep 1992 22:10:55 +0000
parents 4875b01ff377
children d4f6d7467916
files src/keyboard.c
diffstat 1 files changed, 4 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/src/keyboard.c	Mon Sep 14 22:08:02 1992 +0000
+++ b/src/keyboard.c	Mon Sep 14 22:10:55 1992 +0000
@@ -2322,7 +2322,8 @@
   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 @@
       *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);