Much whitespace and capitalization change.

[gnu-emacs] / lisp / imenu.el

diff --git a/lisp/imenu.el b/lisp/imenu.el
index 7c775dc6337166e4dd6d7b12a328492379461669..32dda9fd3c6469d04f8a0f3c83ed83ce2ca5865b 100644 (file)
--- a/lisp/imenu.el
+++ b/lisp/imenu.el
@@ -62,8 +62,6 @@
 
 ;;; Code:
 
-(require 'newcomment)
-
 (eval-when-compile (require 'cl))
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
@@ -126,7 +124,9 @@ If `on-mouse' use a popup menu when `imenu' was invoked with the mouse."
 (defcustom imenu-eager-completion-buffer
   (not (eq imenu-always-use-completion-buffer-p 'never))
   "If non-nil, eagerly popup the completion buffer."
-  :type 'boolean)
+  :type 'boolean
+  :group 'imenu
+  :version "21.4")
 
 (defcustom imenu-after-jump-hook nil
   "*Hooks called after jumping to a place in the buffer.
@@ -743,8 +743,8 @@ for modes which use `imenu--generic-function'.  If it is not set, but
 ;;;###autoload
 (make-variable-buffer-local 'imenu-case-fold-search)
 
-;; Originally "Built on some ideas that Erik Naggum <erik@naggum.no>
-;; once posted to comp.emacs" but since substantially re-written.
+;; This function can be called with quitting disabled,
+;; so it needs to be careful never to loop!
 (defun imenu--generic-function (patterns)
   "Return an index of the current buffer as an alist.
 
@@ -798,6 +798,9 @@ depending on PATTERNS."
     (unwind-protect                    ; for syntax table
        (save-match-data
          (set-syntax-table table)
+         (if (or comment-start comment-start-skip)
+             (comment-normalize-vars))
+
          ;; map over the elements of imenu-generic-expression
          ;; (typically functions, variables ...)
          (dolist (pat patterns)
@@ -806,14 +809,22 @@ depending on PATTERNS."
                  (index (nth 2 pat))
                  (function (nth 3 pat))
                  (rest (nthcdr 4 pat))
+                 start
                  cs)
              ;; Go backwards for convenience of adding items in order.
              (goto-char (point-max))
-             (while (re-search-backward regexp nil t)
+             (while (and (re-search-backward regexp nil t)
+                         ;; Exit the loop if we get an empty match,
+                         ;; because it means a bad regexp was specified.
+                         (not (= (match-beginning 0) (match-end 0))))
+               (setq start (point))
                (goto-char (match-end index))
                (setq beg (match-beginning index))
-               (if (setq cs (save-match-data (comment-beginning)))
-                   (goto-char cs)      ; skip this one, it's in a comment
+               (setq cs (and (or comment-start comment-start-skip)
+                             (save-match-data
+                               (comment-beginning))))
+               (if cs
+                   (goto-char (min cs beg)) ; skip this one, it's in a comment
                  (goto-char beg)
                  (imenu-progress-message prev-pos nil t)
                  ;; Add this sort of submenu only when we've found an
@@ -835,7 +846,11 @@ depending on PATTERNS."
                    ;; Insert the item unless it is already present.
                    (unless (member item (cdr menu))
                      (setcdr menu
-                             (cons item (cdr menu)))))))))
+                             (cons item (cdr menu)))))
+                 ;; Move to the start of the entire match,
+                 ;; to ensure we keep moving backwards
+                 ;; as long as the match is nonempty.
+                 (goto-char start)))))
          (set-syntax-table old-table)))
     (imenu-progress-message prev-pos 100 t)
     ;; Sort each submenu by position.