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

Tweak infinite loop test to check for forward motion as well as none.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index a05d0fc..e2bb42b 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2013-02-01  Glenn Morris  <rgm@gnu.org>
+
+       * imenu.el (imenu-default-create-index-function):
+       Tweak infinite loop test to check for forward motion as well as none.
+
 2013-02-01  Alex Harsanyi  <AlexHarsanyi@gmail.com>
 
        * net/soap-client.el (soap-invoke): Encode the string for

diff --git a/lisp/imenu.el b/lisp/imenu.el
index 80fc441..c1077a4 100644 (file)
--- a/lisp/imenu.el
+++ b/lisp/imenu.el
@@ -676,12 +676,12 @@ 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 -1)
+        (let ((index-alist '()) (pos (point-max))
               name)
-          (goto-char (point-max))
+          (goto-char pos)
           ;; Search for the function
           (while (funcall imenu-prev-index-position-function)
-             (when (= pos (point))
+             (unless (< (point) pos)
                (error "Infinite loop at %s:%d: imenu-prev-index-position-function does not move point" (buffer-name) pos))
              (setq pos (point))
             (save-excursion