# HG changeset patch
# User Richard M. Stallman <rms@gnu.org>
# Date 819952445 0
# Node ID 817ecef2d2d0986de9a99d668953a55f203d4114
# Parent  1e17a9fde8a691f592d02b789bf93d5683bac379
(Fy_or_n_p, Fyes_or_no_p): using_x_p renamed to have_menus_p.
HAVE_X_MENU renamed to HAVE_MENUS.

diff -r 1e17a9fde8a6 -r 817ecef2d2d0 src/fns.c
--- a/src/fns.c	Tue Dec 26 04:33:01 1995 +0000
+++ b/src/fns.c	Tue Dec 26 04:34:05 1995 +0000
@@ -1568,9 +1568,9 @@
 
   while (1)
     {
-#if defined (HAVE_X_MENU) || defined (HAVE_NTGUI)
+#ifdef HAVE_MENUS
       if ((NILP (last_nonmenu_event) || CONSP (last_nonmenu_event))
-	  && using_x_p ())
+	  && have_menus_p ())
 	{
 	  Lisp_Object pane, menu;
 	  redisplay_preserve_echo_area ();
@@ -1582,7 +1582,7 @@
 	  answer = !NILP (obj);
 	  break;
 	}
-#endif
+#endif /* HAVE_MENUS */
       cursor_in_echo_area = 1;
       message_nolog ("%s(y or n) ", XSTRING (xprompt)->data);
 
@@ -1676,9 +1676,9 @@
 
   CHECK_STRING (prompt, 0);
 
-#if defined (HAVE_X_MENU) || defined (HAVE_NTGUI)
+#ifdef HAVE_MENUS
   if ((NILP (last_nonmenu_event) || CONSP (last_nonmenu_event)) 
-      && using_x_p ())
+      && have_menus_p ())
     {
       Lisp_Object pane, menu, obj;
       redisplay_preserve_echo_area ();
@@ -1691,7 +1691,7 @@
       UNGCPRO;
       return obj;
     }
-#endif
+#endif /* HAVE_MENUS */
 
   args[0] = prompt;
   args[1] = build_string ("(yes or no) ");