2 files changed, 9 insertions, 0 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 99f8d8d4886..eeff6cba68c 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,8 @@
 2001-02-20  Gerd Moellmann  <gerd@gnu.org>
 
+        * keyboard.c (read_char): When an event from unread-command-events
+        is from the tool or menu bar, set *USE_MOUSE_MENU to 1.
+
         * window.c (Fwindow_end): Handle case that WINDOW's buffer is not
         equal to the current buffer.
 
diff --git a/src/keyboard.c b/src/keyboard.c
index cc2b41c4b9d..6401389ca5a 100644
--- a/src/keyboard.c
+++ b/src/keyboard.c
@@ -2141,6 +2141,12 @@ read_char (commandflag, nmaps, maps, prev_event, used_mouse_menu)
           && NILP (XCDR (c)))
         c = XCAR (c);
 
+      /* If the queued event is something that used the mouse,
+         set used_mouse_menu accordingly.  */
+      if (used_mouse_menu
+          && (EQ (c, Qtool_bar) || EQ (c, Qmenu_bar)))
+        *used_mouse_menu = 1;
+      
       reread = 1;
       goto reread_for_input_method;
     }