summaryrefslogtreecommitdiff
path: root/lisp/imenu.el
diff options
context:
space:
mode:
authorAlan Mackenzie <acm@muc.de>2020-03-30 19:25:40 +0000
committerAlan Mackenzie <acm@muc.de>2020-03-30 19:25:40 +0000
commit650a664ccd1e801f869f64d441b65db7dcb395f0 (patch)
tree63e6e7f4654af144312c0d86e1c998ad9c3305f9 /lisp/imenu.el
parentc6e0981b96eaa12c28b70c949ccd6e426c13df4d (diff)
downloademacs-650a664ccd1e801f869f64d441b65db7dcb395f0.tar.gz
Let imenu to work on the menu bar when its list is a single non-nested member.
* lisp/imenu.el (imenu-update-menubar): No longer accept a list of length 1 as being sufficient evidence for a nested list structure. Instead, additionally check whether or not certain elements are atoms.
Diffstat (limited to 'lisp/imenu.el')
-rw-r--r--lisp/imenu.el14
1 files changed, 9 insertions, 5 deletions
diff --git a/lisp/imenu.el b/lisp/imenu.el
index fb8b3de662b..1949f2f48f7 100644
--- a/lisp/imenu.el
+++ b/lisp/imenu.el
@@ -911,11 +911,15 @@ to `imenu-update-menubar'.")
(setq index-alist (imenu--split-submenus index-alist))
(let* ((menu (imenu--split-menu index-alist
(buffer-name)))
- (menu1 (imenu--create-keymap (car menu)
- (cdr (if (< 1 (length (cdr menu)))
- menu
- (car (cdr menu))))
- 'imenu--menubar-select)))
+ (menu1 (imenu--create-keymap
+ (car menu)
+ (cdr (if (or (< 1 (length (cdr menu)))
+ ;; Have we a non-nested single entry?
+ (atom (cdadr menu))
+ (atom (cadadr menu)))
+ menu
+ (car (cdr menu))))
+ 'imenu--menubar-select)))
(setcdr imenu--menubar-keymap (cdr menu1)))))))
(defun imenu--menubar-select (item)