Re: Error in C++ mode with Emacs 27.0.90

[Eli Zaretskii]

> Date: Mon, 30 Mar 2020 17:49:38 +0000
> Cc: address@hidden, address@hidden, Dmitry Gutov <address@hidden>
> From: Alan Mackenzie <address@hidden>
> 
> diff --git a/lisp/imenu.el b/lisp/imenu.el
> index fb8b3de662..1949f2f48f 100644
> --- a/lisp/imenu.el
> +++ b/lisp/imenu.el
> @@ -911,11 +911,15 @@ 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)
> 
> 
> Should I commit this to the emacs-27 release branch?

Yes, please.