(popup-menu): Set last-command-event.

(mouse-major-mode-menu-prefix): Declare.

diff --git a/lisp/mouse.el b/lisp/mouse.el
index ef78aff5a7ca35aa00103cdc08d59af37273f184..019ea21e52e4b8c8a0d06f2dbb4a23822a729c56 100644 (file)
--- a/lisp/mouse.el
+++ b/lisp/mouse.el
@@ -88,9 +88,14 @@ PREFIX is the prefix argument (if any) to pass to the command."
              ;; Try again but with the submap.
              (setq map cmd)
            (setq prefix-arg prefix)
+           ;; `setup-specified-language-environment', for instance,
+           ;; expects this to be set from a menu keymap.
+           (setq last-command-event (car (last event)))
            ;; mouse-major-mode-menu was using `command-execute' instead.
            (call-interactively cmd)))))))
-       
+
+(defvar mouse-major-mode-menu-prefix)  ; dynamically bound
+
 (defun mouse-major-mode-menu (event prefix)
   "Pop up a mode-specific menu of mouse commands.
 Default to the Edit menu if the major mode doesn't define a menu."