Commit 6622e416 authored by Stefan Monnier's avatar Stefan Monnier
Browse files

* lisp/imenu.el (imenu-add-to-menubar): `current-local-map' can be nil.

Reported by Noah Friedman.
parent 088be6fb
2012-04-11 Stefan Monnier <monnier@iro.umontreal.ca>
* 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 <larsi@gnus.org>
......
......@@ -963,7 +963,8 @@ See the command `imenu' for more information."
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)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment