diff options
| author | Eli Zaretskii <eliz@gnu.org> | 2014-01-17 13:55:00 +0200 |
|---|---|---|
| committer | Eli Zaretskii <eliz@gnu.org> | 2014-01-17 13:55:00 +0200 |
| commit | 20adfbd8eaf2427526b582b60db74e0b408e0874 (patch) | |
| tree | d0e9fef05fdaa746986af12a9775755797c47aaa /src/menu.c | |
| parent | 160630163c0c14591ad77164ac640581bfb7b503 (diff) | |
| download | emacs-20adfbd8eaf2427526b582b60db74e0b408e0874.tar.gz | |
Provisional fix for bug #16479 with client connecting while in a TTY menu.
src/menu.c (Fx_popup_menu): When invoking tty_menu_show, temporarily
switch to single keyboard. Prevents daemon crashes when a new
client connects while we show a TTY menu in an existing client.
Diffstat (limited to 'src/menu.c')
| -rw-r--r-- | src/menu.c | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/src/menu.c b/src/menu.c index dc3198faf0e..c38152f47e8 100644 --- a/src/menu.c +++ b/src/menu.c @@ -1443,8 +1443,16 @@ no quit occurs and `x-popup-menu' returns nil. */) else #endif if (FRAME_TERMCAP_P (f)) - selection = tty_menu_show (f, xpos, ypos, for_click, keymaps, title, - kbd_menu_navigation, &error_name); + { + ptrdiff_t count1 = SPECPDL_INDEX (); + + /* Avoid crashes if, e.g., another client will connect while we + are in a menu. */ + temporarily_switch_to_single_kboard (f); + selection = tty_menu_show (f, xpos, ypos, for_click, keymaps, title, + kbd_menu_navigation, &error_name); + unbind_to (count1, Qnil); + } #ifdef HAVE_NS unbind_to (specpdl_count, Qnil); |