Fix submenus and screen restoration.

1 files changed, 12 insertions, 1 deletions

diff --git a/src/keyboard.c b/src/keyboard.c
index 4ace767484e..9faa3770cf3 100644
--- a/src/keyboard.c
+++ b/src/keyboard.c
@@ -3903,7 +3903,18 @@ kbd_buffer_get_event (KBOARD **kbp,
             }
         }
       else
-        wait_reading_process_output (0, 0, -1, 1, Qnil, NULL, 0);
+        {
+          bool do_display = true;
+          struct tty_display_info *tty = CURTTY ();
+
+          /* When this TTY is displaying a menu, we must prevent any
+             redisplay, because we modify the frame's glyph matrix
+             behind the back of the display engine.  */
+          if (tty->showing_menu)
+            do_display = false;
+
+          wait_reading_process_output (0, 0, -1, do_display, Qnil, NULL, 0);
+        }
 
       if (!interrupt_input && kbd_fetch_ptr == kbd_store_ptr)
         gobble_input ();