comparison lisp/imenu.el @ 58489:5df4ac03694d

Don't always require newcomment. (imenu--generic-function): Call comment-normalize-vars if we have a comment syntax. Exit the loop if REGEXP matches the null string. Test comment-start as well as comment-start-skip when deciding whether to check for comments.

58488:02e7f3437fea

;;  [david] - David M. Smith [e-mail]
;;  [christian] - Christian Egli [e-mail]
;;  [karl] - Karl Fogel [e-mail]

;;; Code:

(require 'newcomment)

(eval-when-compile (require 'cl))

;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
;;;

for modes which use `imenu--generic-function'.  If it is not set, but
`font-lock-defaults' is set, then font-lock's setting is used.")
;;;###autoload
(make-variable-buffer-local 'imenu-case-fold-search)

;; Originally "Built on some ideas that Erik Naggum <[e-mail]>
;; once posted to comp.emacs" but since substantially re-written.
(defun imenu--generic-function (patterns)
  "Return an index of the current buffer as an alist.

PATTERNS is an alist with elements that look like this:
 (MENU-TITLE REGEXP INDEX).

    (goto-char (point-max))
    (imenu-progress-message prev-pos 0 t)
    (unwind-protect			; for syntax table
	(save-match-data
	  (set-syntax-table table)
	  ;; map over the elements of imenu-generic-expression
	  ;; (typically functions, variables ...)
	  (dolist (pat patterns)
	    (let ((menu-title (car pat))
		  (regexp (nth 1 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)
		(setq start (point))
		(goto-char (match-end index))
		(setq beg (match-beginning index))
		(setq cs (and 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

58489:5df4ac03694d

;;  [david] - David M. Smith [e-mail]
;;  [christian] - Christian Egli [e-mail]
;;  [karl] - Karl Fogel [e-mail]

;;; Code:

(eval-when-compile (require 'cl))

;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
;;;

for modes which use `imenu--generic-function'.  If it is not set, but
`font-lock-defaults' is set, then font-lock's setting is used.")
;;;###autoload
(make-variable-buffer-local 'imenu-case-fold-search)

;; 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.

PATTERNS is an alist with elements that look like this:
 (MENU-TITLE REGEXP INDEX).

    (goto-char (point-max))
    (imenu-progress-message prev-pos 0 t)
    (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)
	    (let ((menu-title (car pat))
		  (regexp (nth 1 pat))

		  (rest (nthcdr 4 pat))
		  start
		  cs)
	      ;; Go backwards for convenience of adding items in order.
	      (goto-char (point-max))
	      (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))
		(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