diff options
Diffstat (limited to 'lisp/imenu.el')
| -rw-r--r-- | lisp/imenu.el | 25 |
1 files changed, 13 insertions, 12 deletions
diff --git a/lisp/imenu.el b/lisp/imenu.el index 443a443faa1..f628936cedc 100644 --- a/lisp/imenu.el +++ b/lisp/imenu.el @@ -674,8 +674,8 @@ depending on PATTERNS." (cons item (cdr menu))))) ;; Go to the start of the match, to make sure we ;; keep making progress backwards. - (goto-char start)))) - (set-syntax-table old-table))) + (goto-char start))))) + (set-syntax-table old-table)) ;; Sort each submenu by position. ;; This is in case one submenu gets items from two different regexps. (dolist (item index-alist) @@ -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) |