From: Karl Heuer <kwzh@gnu.org>
Date: Wed, 15 Mar 1995 21:30:49 +0000 (+0000)
Subject: (mouse-major-mode-menu): Avoid confusing error message when there's no current
X-Git-Tag: emacs-19.34~4835
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=6917cfb00d81729e3f11c261ed931bd0b11d5166;p=emacs.git

(mouse-major-mode-menu): Avoid confusing error message when there's no current
local map.
---

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