changeset 13638:eae7f6d657be

(read_char): Handle unread events from popup menus.
author Richard M. Stallman <rms@gnu.org>
date Fri, 24 Nov 1995 22:42:19 +0000
parents 0b081d93ee6c
children 50d31efc8e72
files src/keyboard.c
diffstat 1 files changed, 7 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/src/keyboard.c	Fri Nov 24 22:24:33 1995 +0000
+++ b/src/keyboard.c	Fri Nov 24 22:42:19 1995 +0000
@@ -1700,6 +1700,13 @@
       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