(popup-menu): If the user refuses to select

from a menu, don't try to invoke the menu.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 1fcf6bbb16146e275d1ba2a70efd30ad589650eb..abbc114644f78707485351d1bc13e05a4d84f84d 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2001-11-03  Richard M. Stallman  <rms@gnu.org>
+
+       * mouse.el (popup-menu): If the user refuses to select
+       from a menu, don't try to invoke the menu.
+
 2001-11-03  Eli Zaretskii  <eliz@is.elta.co.il>
 
        * frame.el (set-background-color, set-foreground-color): Call

diff --git a/lisp/mouse.el b/lisp/mouse.el
index 93a374f3ff1940f763eab4df9236b0d2b0bcb3ac..19b2c82dc6f1684ac831409cdef6ebe99746e4d4 100644 (file)
--- a/lisp/mouse.el
+++ b/lisp/mouse.el
@@ -90,7 +90,9 @@ PREFIX is the prefix argument (if any) to pass to the command."
       (message "")
       ;; Maybe try again but with the submap.
       (setq map (if (keymapp cmd) cmd)))
-    (when (functionp cmd)
+    ;; If the user did not cancel by refusing to select,
+    ;; and if the result is a command, run it.
+    (when (and (null map) (commandp cmd))
       (setq prefix-arg prefix)
       ;; `setup-specified-language-environment', for instance,
       ;; expects this to be set from a menu keymap.