From: Matthew Newton <matt@mnewton.com>
Date: Fri, 20 Sep 2019 13:01:47 +0000 (+0200)
Subject: Fix the previous imenu commit
X-Git-Tag: emacs-27.0.90~1537
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=8b1af4a0bf82a92374d4e8205057880f7d28ede9;p=emacs.git

Fix the previous imenu commit

* lisp/imenu.el (imenu--make-index-alist): Always return the alist
(bug#30449).

Copyright-paperwork-exempt: yes
---

diff --git a/lisp/imenu.el b/lisp/imenu.el
index 9df597b4d63..f8bfc4046c8 100644
--- a/lisp/imenu.el
+++ b/lisp/imenu.el
@@ -510,7 +510,8 @@ See `imenu--index-alist' for the format of the index alist."
        "No items suitable for an index found in this buffer"))
   (or imenu--index-alist
       (setq imenu--index-alist (list nil)))
-  (unless imenu-auto-rescan
+  (if imenu-auto-rescan
+      imenu--index-alist
     ;; Add a rescan option to the index.
     (cons imenu--rescan-item imenu--index-alist)))