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

imenu: Make the test for a single category of map (e.g. "Class") rigorous

Browse source 
This fixes bug #61629.

* lisp/imenu.el (imenu--mouse-menu): Test (consp (cdadr menu)) to avoid
confusion with a single entry for a single function.
(imenu-update-menubar): Change the code to match that above.
This commit is contained in:
Alan Mackenzie 2023-02-19 16:09:32 +00:00
parent 34f44ae07e
commit 8fba4cff1b
1 changed files with 11 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
lisp/imenu.el
View file

@ -756,9 +756,11 @@ Returns t for rescan and otherwise an element or subelement of INDEX-ALIST."
(setq index-alist (imenu--split-submenus index-alist))
(let* ((menu (imenu--split-menu index-alist (or title (buffer-name))))
(map (imenu--create-keymap (car menu)
(cdr (if (< 1 (length (cdr menu)))
menu
(car (cdr menu)))))))
(cdr (if (and (null (cddr menu))
(stringp (caadr menu))
(consp (cdadr menu)))
(cadr menu)
menu)))))
(popup-menu map event)))
(defun imenu-choose-buffer-index (&optional prompt alist)
@ -854,13 +856,12 @@ A trivial interface to `imenu-add-to-menubar' suitable for use in a hook."
(buffer-name)))
(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)))
(cdr (if (and (null (cddr menu))
(stringp (caadr menu))
(consp (cdadr menu)))
(cadr menu)
menu))
'imenu--menubar-select)))
(setcdr imenu--menubar-keymap (cdr menu1)))))))
(defun imenu--menubar-select (item)