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

[Glenn Morris]

------------------------------------------------------------
revno: 111205
committer: Glenn Morris <address@hidden>
branch nick: emacs-24
timestamp: Tue 2013-01-29 23:46:28 -0800
message:
  * imenu.el (imenu-default-create-index-function):
  Put back a version of the infinite loop test removed 2013-01-23.
modified:
  lisp/ChangeLog
  lisp/imenu.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2013-01-28 21:59:42 +0000
+++ b/lisp/ChangeLog    2013-01-30 07:46:28 +0000
@@ -1,3 +1,8 @@
+2013-01-30  Glenn Morris  <address@hidden>
+
+       * 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  <address@hidden>
 
        * progmodes/python.el (python-shell-parse-command): Find

=== modified file 'lisp/imenu.el'
--- a/lisp/imenu.el     2013-01-23 21:55:46 +0000
+++ b/lisp/imenu.el     2013-01-30 07:46:28 +0000
@@ -678,11 +678,13 @@
   ;; 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)))