aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStefan Monnier2006-10-02 02:27:12 +0000
committerStefan Monnier2006-10-02 02:27:12 +0000
commit8f1a5a9b18f83bf8044d0b79cd83707d9d75ef32 (patch)
treed7665416af0f8ad240befa6f04d8f74e119c3b4f
parent04e408d9e2f1a527a9b15e0fb29be4a8740837dc (diff)
downloademacs-8f1a5a9b18f83bf8044d0b79cd83707d9d75ef32.tar.gz
emacs-8f1a5a9b18f83bf8044d0b79cd83707d9d75ef32.zip
(find-function-regexp): Don't match "define-button-type".
-rw-r--r--lisp/ChangeLog3
-rw-r--r--lisp/emacs-lisp/find-func.el2
2 files changed, 4 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index ac87a20cbc1..ade0bda6362 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,8 @@
12006-10-01 Stefan Monnier <monnier@iro.umontreal.ca> 12006-10-01 Stefan Monnier <monnier@iro.umontreal.ca>
2 2
3 * emacs-lisp/find-func.el (find-function-regexp): Don't match
4 "define-button-type".
5
3 * pcvs.el (cvs-update-header): Fix handling of extra newlines so that 6 * pcvs.el (cvs-update-header): Fix handling of extra newlines so that
4 they don't keep accumulating. 7 they don't keep accumulating.
5 8
diff --git a/lisp/emacs-lisp/find-func.el b/lisp/emacs-lisp/find-func.el
index 50b7d8dc9ef..42c5d3183e7 100644
--- a/lisp/emacs-lisp/find-func.el
+++ b/lisp/emacs-lisp/find-func.el
@@ -64,7 +64,7 @@
64 (concat 64 (concat
65 "^\\s-*(\\(def\\(ine-skeleton\\|ine-generic-mode\\|ine-derived-mode\\|\ 65 "^\\s-*(\\(def\\(ine-skeleton\\|ine-generic-mode\\|ine-derived-mode\\|\
66ine\\(?:-global\\)?-minor-mode\\|ine-compilation-mode\\|un-cvs-mode\\|\ 66ine\\(?:-global\\)?-minor-mode\\|ine-compilation-mode\\|un-cvs-mode\\|\
67foo\\|[^cfgv]\\(\\w\\|\\s_\\)+\\*?\\)\\|easy-mmode-define-[a-z-]+\\|easy-menu-define\\|\ 67foo\\|[^icfgv]\\(\\w\\|\\s_\\)+\\*?\\)\\|easy-mmode-define-[a-z-]+\\|easy-menu-define\\|\
68menu-bar-make-toggle\\)" 68menu-bar-make-toggle\\)"
69 find-function-space-re 69 find-function-space-re
70 "\\('\\|\(quote \\)?%s\\(\\s-\\|$\\|\(\\|\)\\)") 70 "\\('\\|\(quote \\)?%s\\(\\s-\\|$\\|\(\\|\)\\)")