* imenu.el (imenu-default-create-index-function):

Put back a version of the infinite loop test removed 2013-01-23.

1 files changed, 3 insertions, 1 deletions

diff --git a/lisp/imenu.el b/lisp/imenu.el
index b72cbeb42b4..0b5d69d6233 100644
--- a/lisp/imenu.el
+++ b/lisp/imenu.el
@@ -678,11 +678,13 @@ The alternate method, which is the one most often used, is to call
   ;; in these major modes.  But save that change for later.
   (cond ((and imenu-prev-index-position-function
 	      imenu-extract-index-name-function)
-	 (let ((index-alist '()) (pos (point))
+	 (let ((index-alist '()) (pos -1)
 	       name)
 	   (goto-char (point-max))
 	   ;; Search for the function
 	   (while (funcall imenu-prev-index-position-function)
+             (when (= pos (point))
+               (error "Infinite loop at %s:%d: imenu-prev-index-position-function does not move point" (buffer-name) pos))
              (setq pos (point))
 	     (save-excursion
 	       (setq name (funcall imenu-extract-index-name-function)))