Mercurial > emacs
diff src/fns.c @ 83716:a73440d2f146 merge-multi-tty-to-trunk
Merge multi-tty branch
Revision: emacs@sv.gnu.org/emacs--devo--0--patch-866
| author | Miles Bader <miles@gnu.org> |
|---|---|
| date | Wed, 29 Aug 2007 05:28:10 +0000 |
| parents | 65663fcd2caa |
| children | a0c901e4e649 |
line wrap: on
line diff
--- a/src/fns.c Wed Aug 29 01:14:48 2007 +0000 +++ b/src/fns.c Wed Aug 29 05:28:10 2007 +0000 @@ -3236,7 +3236,8 @@ { #ifdef HAVE_MENUS - if ((NILP (last_nonmenu_event) || CONSP (last_nonmenu_event)) + if (FRAME_WINDOW_P (SELECTED_FRAME ()) + && (NILP (last_nonmenu_event) || CONSP (last_nonmenu_event)) && use_dialog_box && have_menus_p ()) { @@ -3275,6 +3276,7 @@ Fraise_frame (mini_frame); } + temporarily_switch_to_single_kboard (SELECTED_FRAME ()); obj = read_filtered_event (1, 0, 0, 0, Qnil); cursor_in_echo_area = 0; /* If we need to quit, quit with cursor_in_echo_area = 0. */ @@ -3367,7 +3369,8 @@ CHECK_STRING (prompt); #ifdef HAVE_MENUS - if ((NILP (last_nonmenu_event) || CONSP (last_nonmenu_event)) + if (FRAME_WINDOW_P (SELECTED_FRAME ()) + && (NILP (last_nonmenu_event) || CONSP (last_nonmenu_event)) && use_dialog_box && have_menus_p ()) {