summaryrefslogtreecommitdiff
path: root/lisp/mouse.el
diff options
context:
space:
mode:
authorKarl Heuer <kwzh@gnu.org>1995-03-15 21:30:49 +0000
committerKarl Heuer <kwzh@gnu.org>1995-03-15 21:30:49 +0000
commit7b3a6ad4183a99deff0f0bf87af29cd2ac6c65fc (patch)
tree3fbf69f7bcc660f4db119e3d246823473da2617c /lisp/mouse.el
parentbaa0d00fb69361a79d14639997ebf39f949d7417 (diff)
downloademacs-7b3a6ad4183a99deff0f0bf87af29cd2ac6c65fc.tar.gz
(mouse-major-mode-menu): Avoid confusing error message when there's no current
local map.
Diffstat (limited to 'lisp/mouse.el')
-rw-r--r--lisp/mouse.el3
1 files changed, 2 insertions, 1 deletions
diff --git a/lisp/mouse.el b/lisp/mouse.el
index 917cdca28a3..4ed6d634c2a 100644
--- a/lisp/mouse.el
+++ b/lisp/mouse.el
@@ -52,7 +52,8 @@
(define-key newmap (vector (car event))
(nconc (make-sparse-keymap "Menu")
(mouse-major-mode-menu-1
- (lookup-key (current-local-map) [menu-bar]))))
+ (and (current-local-map)
+ (lookup-key (current-local-map) [menu-bar])))))
(mouse-major-mode-menu-compute-equiv-keys newmap)
(command-execute
;; Make NEWMAP override the usual definition