mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2026-02-08 08:43:52 -08:00
Code Issues Projects Releases Wiki Activity

(Fy_or_n_p, Fyes_or_no_p): using_x_p renamed to have_menus_p.

Browse source 
HAVE_X_MENU renamed to HAVE_MENUS.
This commit is contained in:
Richard M. Stallman 1995-12-26 04:34:05 +00:00
parent 1f0af748ca
commit 0ef68e8a27
1 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/fns.c
View file

@ -1568,9 +1568,9 @@ Also accepts Space to mean yes, or Delete to mean no.")
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 @@ Also accepts Space to mean yes, or Delete to mean no.")
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 @@ and can edit it until it has been confirmed.")
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 @@ and can edit it until it has been confirmed.")
UNGCPRO;
return obj;
}
#endif
#endif /* HAVE_MENUS */
args[0] = prompt;
args[1] = build_string ("(yes or no) ");