aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDmitry Gutov2015-01-25 02:20:01 +0200
committerDmitry Gutov2015-01-25 02:20:01 +0200
commitbce27d884521832a62837b113f4e681974cdaccb (patch)
tree32a18c2c9b851d56583fc392bd2a77e861516694
parent02cbd38ae4e4a1e4d309a1bb27c031e154c53f27 (diff)
downloademacs-bce27d884521832a62837b113f4e681974cdaccb.tar.gz
emacs-bce27d884521832a62837b113f4e681974cdaccb.zip
(find-function-regexp): Don't match `defgroup'
* lisp/emacs-lisp/find-func.el (find-function-regexp): Don't match `defgroup' (regression from the previous change here).
-rw-r--r--lisp/ChangeLog5
-rw-r--r--lisp/emacs-lisp/find-func.el2
2 files changed, 6 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 15518a73eb1..d42670f743b 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
12015-01-25 Dmitry Gutov <dgutov@yandex.ru>
2
3 * emacs-lisp/find-func.el (find-function-regexp): Don't match
4 `defgroup' (regression from the previous change here).
5
12015-01-23 Thomas Fitzsimmons <fitzsim@fitzsim.org> 62015-01-23 Thomas Fitzsimmons <fitzsim@fitzsim.org>
2 7
3 * net/ldap.el (ldap-search-internal): Mention binddn in invalid 8 * net/ldap.el (ldap-search-internal): Mention binddn in invalid
diff --git a/lisp/emacs-lisp/find-func.el b/lisp/emacs-lisp/find-func.el
index 6c9c798bc16..7ea13d4637b 100644
--- a/lisp/emacs-lisp/find-func.el
+++ b/lisp/emacs-lisp/find-func.el
@@ -59,7 +59,7 @@
59 (concat 59 (concat
60 "^\\s-*(\\(def\\(ine-skeleton\\|ine-generic-mode\\|ine-derived-mode\\|\ 60 "^\\s-*(\\(def\\(ine-skeleton\\|ine-generic-mode\\|ine-derived-mode\\|\
61ine\\(?:-global\\)?-minor-mode\\|ine-compilation-mode\\|un-cvs-mode\\|\ 61ine\\(?:-global\\)?-minor-mode\\|ine-compilation-mode\\|un-cvs-mode\\|\
62foo\\|\\(?:[^icfv]\\|g[^r]\\)\\(\\w\\|\\s_\\)+\\*?\\)\\|easy-mmode-define-[a-z-]+\\|easy-menu-define\\|\ 62foo\\|\\(?:[^icfgv]\\|g[^r]\\)\\(\\w\\|\\s_\\)+\\*?\\)\\|easy-mmode-define-[a-z-]+\\|easy-menu-define\\|\
63menu-bar-make-toggle\\)" 63menu-bar-make-toggle\\)"
64 find-function-space-re 64 find-function-space-re
65 "\\('\\|\(quote \\)?%s\\(\\s-\\|$\\|\(\\|\)\\)") 65 "\\('\\|\(quote \\)?%s\\(\\s-\\|$\\|\(\\|\)\\)")