From 72cea080f2fc1a97763272f1f044b240e6e65161 Mon Sep 17 00:00:00 2001
From: "Richard M. Stallman" <rms@gnu.org>
Date: Mon, 14 Sep 1992 22:10:55 +0000
Subject: [PATCH] (read_char_menu_prompt): Use X menu code if HAVE_X_WINDOWS
 and not NO_X_MENU.

---
 src/keyboard.c | 6 ++++--
 1 file 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);