diff options
| author | Richard M. Stallman | 2001-11-02 07:14:16 +0000 |
|---|---|---|
| committer | Richard M. Stallman | 2001-11-02 07:14:16 +0000 |
| commit | 324cd9721265a001f435edb032802a3f9d7aca0f (patch) | |
| tree | cc469b937d46a106e37d3b98ec710d4dba99f2cf | |
| parent | 8faef085c5580f260af51d2ff1a3575cf8c54748 (diff) | |
| download | emacs-324cd9721265a001f435edb032802a3f9d7aca0f.tar.gz emacs-324cd9721265a001f435edb032802a3f9d7aca0f.zip | |
(popup-menu): If the user refuses to select
from a menu, don't try to invoke the menu.
| -rw-r--r-- | lisp/mouse.el | 4 |
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." | |||
| 90 | (message "") | 90 | (message "") |
| 91 | ;; Maybe try again but with the submap. | 91 | ;; Maybe try again but with the submap. |
| 92 | (setq map (if (keymapp cmd) cmd))) | 92 | (setq map (if (keymapp cmd) cmd))) |
| 93 | (when (functionp cmd) | 93 | ;; If the user did not cancel by refusing to select, |
| 94 | ;; and if the result is a command, run it. | ||
| 95 | (when (and (null map) (commandp cmd)) | ||
| 94 | (setq prefix-arg prefix) | 96 | (setq prefix-arg prefix) |
| 95 | ;; `setup-specified-language-environment', for instance, | 97 | ;; `setup-specified-language-environment', for instance, |
| 96 | ;; expects this to be set from a menu keymap. | 98 | ;; expects this to be set from a menu keymap. |