From: Richard M. Stallman <rms@gnu.org>
Date: Fri, 2 Nov 2001 07:14:16 +0000 (+0000)
Subject: (popup-menu): If the user refuses to select
X-Git-Tag: ttn-vms-21-2-B4~18885
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=324cd9721265a001f435edb032802a3f9d7aca0f;p=emacs.git

(popup-menu): If the user refuses to select
from a menu, don't try to invoke the menu.
---

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.