Mercurial > emacs
changeset 6850:d2d8b40fb599
(Fy_or_n_p, Fyes_or_no_p): Test HAVE_X_MENU.
| author | Karl Heuer <kwzh@gnu.org> |
|---|---|
| date | Wed, 13 Apr 1994 18:00:37 +0000 |
| parents | e0b9e757376c |
| children | a4cfe12560d0 |
| files | src/fns.c |
| diffstat | 1 files changed, 10 insertions(+), 9 deletions(-) [+] |
line wrap: on
line diff
--- a/src/fns.c Wed Apr 13 17:52:13 1994 +0000 +++ b/src/fns.c Wed Apr 13 18:00:37 1994 +0000 @@ -1130,6 +1130,7 @@ while (1) { +#ifdef HAVE_X_MENU if (NILP (last_nonmenu_event) || CONSP (last_nonmenu_event)) { Lisp_Object pane, menu; @@ -1141,16 +1142,14 @@ answer = !NILP (obj); break; } - else - { - cursor_in_echo_area = 1; - message ("%s(y or n) ", XSTRING (xprompt)->data); +#endif + cursor_in_echo_area = 1; + message ("%s(y or n) ", XSTRING (xprompt)->data); - obj = read_filtered_event (1, 0, 0); - cursor_in_echo_area = 0; - /* If we need to quit, quit with cursor_in_echo_area = 0. */ - QUIT; - } + obj = read_filtered_event (1, 0, 0); + cursor_in_echo_area = 0; + /* If we need to quit, quit with cursor_in_echo_area = 0. */ + QUIT; key = Fmake_vector (make_number (1), obj); def = Flookup_key (map, key); @@ -1232,6 +1231,7 @@ CHECK_STRING (prompt, 0); +#ifdef HAVE_X_MENU if (NILP (last_nonmenu_event) || CONSP (last_nonmenu_event)) { Lisp_Object pane, menu, obj; @@ -1244,6 +1244,7 @@ UNGCPRO; return obj; } +#endif args[0] = prompt; args[1] = build_string ("(yes or no) ");