diff options
| author | Eli Zaretskii <eliz@gnu.org> | 2014-01-25 10:25:51 +0200 |
|---|---|---|
| committer | Eli Zaretskii <eliz@gnu.org> | 2014-01-25 10:25:51 +0200 |
| commit | e96f7bf11ebeef086c48776ecfe8c41a1c0db7c4 (patch) | |
| tree | 0649dfcf7ef5204a2d9449b630b885de2f0556eb /src/term.c | |
| parent | caece7c39334aec764ec661e04490030b3c80385 (diff) | |
| download | emacs-e96f7bf11ebeef086c48776ecfe8c41a1c0db7c4.tar.gz | |
Fix bug #16479 with client connections while TTY menu is open.
src/term.c (read_menu_input): If the selected frame changes, exit
the menu.
(tty_menu_show): If the selected frame changes while we displayed
a menu, throw to top level.
Diffstat (limited to 'src/term.c')
| -rw-r--r-- | src/term.c | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/src/term.c b/src/term.c index 4d8da135f6e..0c40c2d16b9 100644 --- a/src/term.c +++ b/src/term.c @@ -3124,7 +3124,11 @@ read_menu_input (struct frame *sf, int *x, int *y, int min_y, int max_y, tty->showing_menu = 0; do_mouse_tracking = saved_mouse_tracking; - if (EQ (cmd, Qt) || EQ (cmd, Qtty_menu_exit)) + if (EQ (cmd, Qt) || EQ (cmd, Qtty_menu_exit) + /* If some input switched frames under our feet, exit the + menu, since the menu faces are no longer valid, and the + menu is no longer relevant anyway. */ + || sf != SELECTED_FRAME ()) return MI_QUIT_MENU; if (EQ (cmd, Qtty_menu_mouse_movement)) mouse_get_xy (x, y); @@ -3791,6 +3795,11 @@ tty_menu_show (struct frame *f, int x, int y, bool for_click, bool keymaps, case TTYM_IA_SELECT: break; case TTYM_NO_SELECT: + /* If the selected frame was changed while we displayed a menu, + throw to top level in order to undo any temporary settings + made by TTY menu code. */ + if (f != SELECTED_FRAME ()) + Ftop_level (); /* Make "Cancel" equivalent to C-g unless FOR_CLICK (which means the menu was invoked with a mouse event as POSITION). */ if (! for_click) |