(find-function-regexp): Optimize `define-minor-mode'. Add `defun-cvs-mode'.

Add `deffoo'.  Add `f' to [^cgv] to exclude `defface'.
Remove invalid `\W' from [^cgv\W].  Doc fix.
(find-function-search-for-symbol): Replace "\\>" with "\\_>".

2 files changed, 11 insertions, 3 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 49e63e68690..c16f58d5ccf 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,11 @@
+2004-11-16  Juri Linkov  <juri@jurta.org>
+
+        * emacs-lisp/find-func.el (find-function-regexp):
+        Optimize `define-minor-mode'.  Add `defun-cvs-mode'.
+        Add `deffoo'.  Add `f' to [^cgv] to exclude `defface'.
+        Remove invalid `\W' from [^cgv\W].  Doc fix.
+        (find-function-search-for-symbol): Replace "\\>" with "\\_>".
+
 2004-11-15  Luc Teirlinck  <teirllm@auburn.edu>
 
         * play/life.el: Maintainer is now FSF.
diff --git a/lisp/emacs-lisp/find-func.el b/lisp/emacs-lisp/find-func.el
index 54efd14b358..2a58c10f827 100644
--- a/lisp/emacs-lisp/find-func.el
+++ b/lisp/emacs-lisp/find-func.el
@@ -62,13 +62,13 @@
   ;;  (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\
+ine-minor-mode\\|un-cvs-mode\\|foo\\|[^cfgv]\\w+\\*?\\)\
 \\|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',
-`defgroup', `defvar'.
+`defgroup', `defvar', `defface'.
 
 Please send improvements and fixes to the maintainer."
   :type 'regexp
@@ -202,7 +202,7 @@ If VARIABLE-P is nil, `find-function-regexp' is used, otherwise
                     (re-search-forward
                      (concat "^([^ ]+" find-function-space-re "['(]"
                              (regexp-quote (symbol-name symbol))
-                             "\\>")
+                             "\\_>")
                      nil t))
                 (progn
                   (beginning-of-line)