[Emacs-diffs] /srv/bzr/emacs/trunk r111649: * imenu.el (imenu-default-create-index-function):

[Glenn Morris]

------------------------------------------------------------
revno: 111649
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Fri 2013-02-01 00:23:47 -0800
message:
  * imenu.el (imenu-default-create-index-function):
  Tweak infinite loop test to check for forward motion as well as none.
modified:
  lisp/ChangeLog
  lisp/imenu.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2013-02-01 07:28:10 +0000
+++ b/lisp/ChangeLog    2013-02-01 08:23:47 +0000
@@ -1,3 +1,8 @@
+2013-02-01  Glenn Morris  <address@hidden>
+
+       * 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  <address@hidden>
 
        * net/soap-client.el (soap-invoke): Encode the string for

=== modified file 'lisp/imenu.el'
--- a/lisp/imenu.el     2013-01-30 17:57:54 +0000
+++ b/lisp/imenu.el     2013-02-01 08:23:47 +0000
@@ -676,12 +676,12 @@
   ;; 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