From: Richard M. Stallman <rms@gnu.org>
Date: Wed, 22 Feb 1995 01:31:14 +0000 (+0000)
Subject: (imenu--cleanup): Set alist to its default just once, at the beginning.
X-Git-Tag: emacs-19.34~5063
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=4818d2106310dbeaf1aab5ca2668e3d3ca5ab3a5;p=emacs.git

(imenu--cleanup): Set alist to its default just once, at the beginning.
Don't recurse on a cdr which is nil.
---

diff --git a/lisp/imenu.el b/lisp/imenu.el
index aa4dd433dbe..f35116d840c 100644
--- a/lisp/imenu.el
+++ b/lisp/imenu.el
@@ -488,16 +488,18 @@ or 'imenu-create-index-function")
   ;; Sets the markers in imenu--index-alist 
   ;; point nowhere.
   ;; if alist is provided use that list.
-  (and imenu--index-alist
+  (or alist
+      (setq alist imenu--index-alist))
+  (and alist
        (mapcar
 	(function
 	 (lambda (item)
 	   (cond
 	    ((markerp (cdr item))
 	     (set-marker (cdr item) nil))
-	    ((listp (cdr item))
+	    ((consp (cdr item))
 	     (imenu--cleanup (cdr item))))))
-	(if alist alist imenu--index-alist))
+	alist)
        t))
 
 (defun imenu-default-create-index-function ()