[Emacs-diffs] /srv/bzr/emacs/trunk r107875: * lisp/imenu.el (imenu-add-to-menubar): `current-local-map' can be nil.

[Stefan Monnier]

------------------------------------------------------------
revno: 107875
committer: Stefan Monnier <address@hidden>
branch nick: trunk
timestamp: Wed 2012-04-11 17:37:13 -0400
message:
  * lisp/imenu.el (imenu-add-to-menubar): `current-local-map' can be nil.
  Reported by Noah Friedman.
modified:
  lisp/ChangeLog
  lisp/imenu.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2012-04-11 18:13:20 +0000
+++ b/lisp/ChangeLog    2012-04-11 21:37:13 +0000
@@ -1,5 +1,8 @@
 2012-04-11  Stefan Monnier  <address@hidden>
 
+       * imenu.el (imenu-add-to-menubar): `current-local-map' can be nil.
+       Reported by Noah Friedman.
+
        * subr.el (read-passwd): Use read-string.
 
 2012-04-11  Lars Magne Ingebrigtsen  <address@hidden>

=== modified file 'lisp/imenu.el'
--- a/lisp/imenu.el     2012-03-15 01:38:40 +0000
+++ b/lisp/imenu.el     2012-04-11 21:37:13 +0000
@@ -963,7 +963,8 @@
          imenu-generic-expression
          (not (eq imenu-create-index-function
                   'imenu-default-create-index-function)))
-      (unless (keymapp (lookup-key (current-local-map) [menu-bar index]))
+      (unless (and (current-local-map)
+                   (keymapp (lookup-key (current-local-map) [menu-bar index])))
        (let ((newmap (make-sparse-keymap)))
          (set-keymap-parent newmap (current-local-map))
          (setq imenu--last-menubar-index-alist nil)