(read_char): Handle unread events from popup menus.

2479e91e · Richard M. Stallman · 954080b4 · 2479e91e
Commit 2479e91e authored Nov 24, 1995 by Richard M. Stallman
Hide whitespace changes
Inline Side-by-side

Showing with 7 additions and 0 deletions

src/keyboard.c src/keyboard.c +7 -0

No files found.
--- a/src/keyboard.c
+++ b/src/keyboard.c
@@ -1700,6 +1700,13 @@ read_char (commandflag, nmaps, maps, prev_event, used_mouse_menu)
      c = XCONS (Vunread_command_events)->car;
      Vunread_command_events = XCONS (Vunread_command_events)->cdr;

+      /* Undo what read_char_x_menu_prompt did when it unread
+	 additional keys returned by Fx_popup_menu.  */
+      if (CONSP (c)
+	  && (SYMBOLP (XCONS (c)->car) || INTEGERP (XCONS (c)->car))
+	  && NILP (XCONS (c)->cdr))
+	c = XCONS (c)->car;
+
      if (this_command_key_count == 0)
 	goto reread_first;
      else