procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source 
Reported by Noah Friedman.
This commit is contained in:
Stefan Monnier 2012-04-11 17:37:13 -04:00
parent 088be6fbd2
commit 6622e4169b
2 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
lisp/ChangeLog
View file

@ -1,5 +1,8 @@
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>

3
lisp/imenu.el
View file

@ -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)