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

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

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 26ad7ec799a22a2ae582beb02ec8e7863374fed9..aaa01698f124bf73439f8402bda3d4e63c8ca68f 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2013-01-30  Glenn Morris  <rgm@gnu.org>
+
+       * imenu.el (imenu-default-create-index-function):
+       Put back a version of the infinite loop test removed 2013-01-23.
+
 2013-01-28  Fabián Ezequiel Gallina  <fgallina@cuca>
 
        * progmodes/python.el (python-shell-parse-command): Find

diff --git a/lisp/imenu.el b/lisp/imenu.el
index b72cbeb42b4102930169de9bbaa7da023d2d0bfa..0b5d69d623371f20ced230780cd2a468d5cf396b 100644 (file)
--- 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)))