aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDave Love1999-11-23 19:12:27 +0000
committerDave Love1999-11-23 19:12:27 +0000
commitd8f479c6d26566a68c2c01e1adfd89815ec2e78b (patch)
tree3aaed8014c024e0d89f50d91b5caf9c74b5158da
parentb1775dc1417b8bfe2fd6635b65384d43d8a5d664 (diff)
downloademacs-d8f479c6d26566a68c2c01e1adfd89815ec2e78b.tar.gz
emacs-d8f479c6d26566a68c2c01e1adfd89815ec2e78b.zip
(find-function-regexp): Use `define-minor-mode' after easy-menu
change.
-rw-r--r--lisp/ChangeLog5
-rw-r--r--lisp/emacs-lisp/find-func.el6
2 files changed, 8 insertions, 3 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 7528e6b3224..1edfca27cd5 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
11999-11-23 Dave Love <fx@gnu.org>
2
3 * find-func.el (find-function-regexp): Use `define-minor-mode'
4 after easy-menu change.
5
11999-11-23 Gerd Moellmann <gerd@gnu.org> 61999-11-23 Gerd Moellmann <gerd@gnu.org>
2 7
3 * comint.el: Add redirection.from active comint buffers into 8 * comint.el: Add redirection.from active comint buffers into
diff --git a/lisp/emacs-lisp/find-func.el b/lisp/emacs-lisp/find-func.el
index e7607494d04..34e569b4016 100644
--- a/lisp/emacs-lisp/find-func.el
+++ b/lisp/emacs-lisp/find-func.el
@@ -57,9 +57,9 @@
57(defcustom find-function-regexp 57(defcustom find-function-regexp
58 ;; Match things like (defun foo ...), (defmacro foo ...), 58 ;; Match things like (defun foo ...), (defmacro foo ...),
59 ;; (define-skeleton foo ...), (define-generic-mode 'foo ...), 59 ;; (define-skeleton foo ...), (define-generic-mode 'foo ...),
60 ;; (define-derived-mode foo ...), (easy-mmode-define-minor-mode foo) 60 ;; (define-derived-mode foo ...), (define-minor-mode foo)
61 "^\\s-*(\\(def\\(ine-skeleton\\|ine-generic-mode\\|ine-derived-mode\\|\ 61 "^\\s-*(\\(def\\(ine-skeleton\\|ine-generic-mode\\|ine-derived-mode\\|\
62\[^cgv\W]\\w+\\*?\\)\\|easy-mmode-define-minor-mode\\)\\s-+'?\ 62\[^cgv\W]\\w+\\*?\\)\\|define-minor-mode)\\s-+'?\
63%s\\(\\s-\\|$\\|\(\\|\)\\)" 63%s\\(\\s-\\|$\\|\(\\|\)\\)"
64 "The regexp used by `find-function' to search for a function definition. 64 "The regexp used by `find-function' to search for a function definition.
65Note it must contain a `%s' at the place where `format' 65Note it must contain a `%s' at the place where `format'
@@ -69,7 +69,7 @@ should insert the function name. The default value avoids `defconst',
69Please send improvements and fixes to the maintainer." 69Please send improvements and fixes to the maintainer."
70 :type 'regexp 70 :type 'regexp
71 :group 'find-function 71 :group 'find-function
72 :version "20.3") 72 :version "21.1")
73 73
74(defcustom find-variable-regexp 74(defcustom find-variable-regexp
75 "^\\s-*(def[^uma\W]\\w+\\*?\\s-+%s\\(\\s-\\|$\\)" 75 "^\\s-*(def[^uma\W]\\w+\\*?\\s-+%s\\(\\s-\\|$\\)"