[Emacs-diffs] Changes to emacs/lisp/emacs-lisp/find-func.el

[Stefan Monnier]

Index: emacs/lisp/emacs-lisp/find-func.el
diff -c emacs/lisp/emacs-lisp/find-func.el:1.34 
emacs/lisp/emacs-lisp/find-func.el:1.35
*** emacs/lisp/emacs-lisp/find-func.el:1.34     Sun May 12 15:05:37 2002
--- emacs/lisp/emacs-lisp/find-func.el  Thu May 16 16:11:23 2002
***************
*** 54,67 ****
  ;;   :prefix "find-function"
    :group 'lisp)
  
  (defcustom find-function-regexp
    ;; Match things like (defun foo ...), (defmacro foo ...),
    ;; (define-skeleton foo ...), (define-generic-mode 'foo ...),
    ;;  (define-derived-mode foo ...), (define-minor-mode foo)
!   "^\\s-*(\\(def\\(ine-skeleton\\|ine-generic-mode\\|ine-derived-mode\\|\
  \[^cgv\W]\\w+\\*?\\)\\|define-minor-mode\
! \\|easy-mmode-define-global-mode\\)\\(\\s-\\|\n\\)+\\('\\|\(quote \\)?\
! %s\\(\\s-\\|$\\|\(\\|\)\\)"
    "The regexp used by `find-function' to search for a function definition.
  Note it must contain a `%s' at the place where `format'
  should insert the function name.  The default value avoids `defconst',
--- 54,70 ----
  ;;   :prefix "find-function"
    :group 'lisp)
  
+ (defconst find-function-space-re "\\(?:\\s-\\|\n\\|;.*\n\\)+")
+ 
  (defcustom find-function-regexp
    ;; Match things like (defun foo ...), (defmacro foo ...),
    ;; (define-skeleton foo ...), (define-generic-mode 'foo ...),
    ;;  (define-derived-mode foo ...), (define-minor-mode foo)
!   (concat
!    "^\\s-*(\\(def\\(ine-skeleton\\|ine-generic-mode\\|ine-derived-mode\\|\
  \[^cgv\W]\\w+\\*?\\)\\|define-minor-mode\
! \\|easy-mmode-define-global-mode\\)" find-function-space-re
!    "\\('\\|\(quote \\)?%s\\(\\s-\\|$\\|\(\\|\)\\)")
    "The regexp used by `find-function' to search for a function definition.
  Note it must contain a `%s' at the place where `format'
  should insert the function name.  The default value avoids `defconst',
***************
*** 73,79 ****
    :version "21.1")
  
  (defcustom find-variable-regexp
!   "^\\s-*(def[^umag]\\(\\w\\|\\s_\\)+\\*?\\s-+%s\\(\\s-\\|$\\)"
    "The regexp used by `find-variable' to search for a variable definition.
  It should match right up to the variable name.  The default value
  avoids `defun', `defmacro', `defalias', `defadvice', `defgroup'.
--- 76,82 ----
    :version "21.1")
  
  (defcustom find-variable-regexp
!   (concat"^\\s-*(def[^umag]\\(\\w\\|\\s_\\)+\\*?" find-function-space-re 
"%s\\(\\s-\\|$\\)")
    "The regexp used by `find-variable' to search for a variable definition.
  It should match right up to the variable name.  The default value
  avoids `defun', `defmacro', `defalias', `defadvice', `defgroup'.
***************
*** 145,151 ****
            (goto-char (point-min))
            (if (or (re-search-forward regexp nil t)
                    (re-search-forward
!                    (concat "^([^ ]+\\(\\s-\\|\n\\)+"
                             (regexp-quote (symbol-name symbol))
                             "\\>")
                     nil t))
--- 148,154 ----
            (goto-char (point-min))
            (if (or (re-search-forward regexp nil t)
                    (re-search-forward
!                    (concat "^([^ ]+" find-function-space-re "['(]"
                             (regexp-quote (symbol-name symbol))
                             "\\>")
                     nil t))