From: Sam Steingold Date: Mon, 11 Jan 2010 20:53:23 +0000 (-0500) Subject: (imenu-default-create-index-function): Detect infinite X-Git-Tag: emacs-pretest-23.1.92~47 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=d8b8451f8ea52d751035449278ec36c3e598f9cf;p=emacs.git (imenu-default-create-index-function): Detect infinite loops caused by imenu-prev-index-position-function. --- diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 51687a04553..f8248d837b1 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2010-01-11 Sam Steingold + + * imenu.el (imenu-default-create-index-function): Detect infinite + loops caused by imenu-prev-index-position-function. + 2010-01-11 Juanma Barranquero * htmlfontify.el (htmlfontify-load-rgb-file) diff --git a/lisp/imenu.el b/lisp/imenu.el index 77035c602d8..47c99ad1997 100644 --- a/lisp/imenu.el +++ b/lisp/imenu.el @@ -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)))