summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRichard M. Stallman <rms@gnu.org>2001-11-02 07:14:16 +0000
committerRichard M. Stallman <rms@gnu.org>2001-11-02 07:14:16 +0000
commit324cd9721265a001f435edb032802a3f9d7aca0f (patch)
treecc469b937d46a106e37d3b98ec710d4dba99f2cf
parent8faef085c5580f260af51d2ff1a3575cf8c54748 (diff)
downloademacs-324cd9721265a001f435edb032802a3f9d7aca0f.tar.gz
(popup-menu): If the user refuses to select
from a menu, don't try to invoke the menu.
-rw-r--r--lisp/mouse.el4
1 files changed, 3 insertions, 1 deletions
diff --git a/lisp/mouse.el b/lisp/mouse.el
index 7f7f446d724..192107a55f2 100644
--- 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.