From: Richard M. Stallman <rms@gnu.org>
Date: Fri, 24 Nov 1995 22:42:19 +0000 (+0000)
Subject: (read_char): Handle unread events from popup menus.
X-Git-Tag: emacs-19.34~2222
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=2479e91e2c1eec84c64de8ca279c77f2b10eb564;p=emacs.git

(read_char): Handle unread events from popup menus.
---

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