From 6eb0f0294ffeb37906fb32ca1e6dac7d74f374e1 Mon Sep 17 00:00:00 2001
From: "Richard M. Stallman" <rms@gnu.org>
Date: Fri, 24 Nov 1995 22:42:19 +0000
Subject: (read_char): Handle unread events from popup menus.

---
 src/keyboard.c | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/src/keyboard.c b/src/keyboard.c
index 74614ce2f10..04291a24105 100644
--- 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
-- 
cgit v1.2.1