procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

(imenu-default-create-index-function): Detect infinite

Browse source 
loops caused by imenu-prev-index-position-function.
This commit is contained in:
Sam Steingold 2010-01-11 15:53:23 -05:00
parent 30afcdfffd
commit d8b8451f8e
2 changed files with 10 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
lisp/ChangeLog
View file

@ -1,3 +1,8 @@
2010-01-11 Sam Steingold <sds@gnu.org>
* imenu.el (imenu-default-create-index-function): Detect infinite
loops caused by imenu-prev-index-position-function.
2010-01-11 Juanma Barranquero <lekktu@gmail.com>
* htmlfontify.el (htmlfontify-load-rgb-file)

7
lisp/imenu.el
View file

@ -596,7 +596,7 @@ See `imenu--index-alist' for the format of the index alist."
;;; Find all markers in alist and makes
;;; them point nowhere.
;;; The top-level call uses nil as the argument;
;;; non-nil arguments are in recursivecalls.
;;; non-nil arguments are in recursive calls.
(defvar imenu--cleanup-seen)
(defun imenu--cleanup (&optional alist)
@ -684,12 +684,15 @@ 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 '())
(let ((index-alist '()) (pos (point))
prev-pos name)
(goto-char (point-max))
(imenu-progress-message prev-pos 0 t)
;; 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))
(imenu-progress-message prev-pos nil t)
(save-excursion
(setq name (funcall imenu-extract-index-name-function)))