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

[Stefan Monnier]

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

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2012-04-11 18:09:10 +0000
+++ b/lisp/ChangeLog    2012-04-11 21:41:58 +0000
@@ -1,9 +1,13 @@
+2012-04-11  Stefan Monnier  <address@hidden>
+
+       * imenu.el (imenu-add-to-menubar): `current-local-map' can be nil.
+       Reported by Noah Friedman.  Backport from trunk.
+
 2012-04-11  Alan Mackenzie  <address@hidden>
 
-       * progmodes/cc-menus.el (cc-imenu-objc-generic-expression): Make
-       imenu work again for Objective C Mode.  Correct the *-index
-       values, these having been disturbed by a previous change in
-       2011-08.
+       * progmodes/cc-menus.el (cc-imenu-objc-generic-expression):
+       Make imenu work again for Objective C Mode.  Correct the *-index
+       values, these having been disturbed by a previous change in 2011-08.
 
        * progmodes/cc-engine.el (c-before-change-check-<>-operators):
        Correct two search limits.
@@ -56,8 +60,8 @@
 
 2012-04-07  Eli Zaretskii  <address@hidden>
 
-       * minibuffer.el (completion-in-region-mode-map): Bind
-       completion-help-at-point to M-? rather than ?.  (Bug#11182)
+       * minibuffer.el (completion-in-region-mode-map):
+       Bind completion-help-at-point to M-? rather than ?.  (Bug#11182)
 
 2012-04-05  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:41:58 +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)