(find-function-regexp): Allow dashes in defun name, in similar fashion

to find-variable-regexp.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 558af5fab0b8e1cb272349d133ed4a5ab95f1a5f..59d12a7f41b8feec990dab17bbadbe2fe6fa03cd 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2006-04-10  Bill Wohler  <wohler@newt.com>
+
+       * emacs-lisp/find-func.el (find-function-regexp): Allow dashes in
+       defun name, in similar fashion to find-variable-regexp.
+
 2006-04-10  Eli Zaretskii  <eliz@gnu.org>
 
        * international/mule-cmds.el (set-locale-environment): Fix last

diff --git a/lisp/emacs-lisp/find-func.el b/lisp/emacs-lisp/find-func.el
index 0738444c9ec3b6c124fe76015b3a59bc58636d72..754ad9fdf195e29c97c185abd03f5432dd05a019 100644 (file)
--- a/lisp/emacs-lisp/find-func.el
+++ b/lisp/emacs-lisp/find-func.el
@@ -64,7 +64,7 @@
   (concat
    "^\\s-*(\\(def\\(ine-skeleton\\|ine-generic-mode\\|ine-derived-mode\\|\
 ine\\(?:-global\\)?-minor-mode\\|ine-compilation-mode\\|un-cvs-mode\\|\
-foo\\|[^cfgv]\\w+\\*?\\)\\|easy-mmode-define-[a-z-]+\\|easy-menu-define\\|\
+foo\\|[^cfgv]\\(\\w\\|\\s_\\)+\\*?\\)\\|easy-mmode-define-[a-z-]+\\|easy-menu-define\\|\
 menu-bar-make-toggle\\)"
    find-function-space-re
    "\\('\\|\(quote \\)?%s\\(\\s-\\|$\\|\(\\|\)\\)")