summaryrefslogtreecommitdiff
path: root/lib-src
diff options
context:
space:
mode:
authorGlenn Morris <rgm@gnu.org>2014-07-12 10:53:29 -0700
committerGlenn Morris <rgm@gnu.org>2014-07-12 10:53:29 -0700
commitb39c4d7b33952e0125fbefbcb3d9f528b6570f40 (patch)
tree17fd0630dacfe29b0c2486b9f5c923293e872a70 /lib-src
parent2a0bae50e3611a6bd2d584f7a85677b74f1aa71b (diff)
parentfb02552638b0c653bfc3d269d879fdffba37bd31 (diff)
downloademacs-b39c4d7b33952e0125fbefbcb3d9f528b6570f40.tar.gz
Merge from emacs-24; up to 2014-06-22T05:00:14Z!dmantipov@yandex.ru
Diffstat (limited to 'lib-src')
-rw-r--r--lib-src/ChangeLog4
-rw-r--r--lib-src/etags.c3
2 files changed, 7 insertions, 0 deletions
diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog
index 64a73027915..3a7d128b905 100644
--- a/lib-src/ChangeLog
+++ b/lib-src/ChangeLog
@@ -1,3 +1,7 @@
+2014-07-12 Paul Eggert <eggert@cs.ucla.edu>
+
+ * etags.c (Lisp_functions): Also record cl-defun etc. (Bug#17965)
+
2014-06-26 Glenn Morris <rgm@gnu.org>
* Makefile.in (blessmail): Depend on lisp/mail/blessmail.el.
diff --git a/lib-src/etags.c b/lib-src/etags.c
index 66e7fbb467f..5f1f99c4677 100644
--- a/lib-src/etags.c
+++ b/lib-src/etags.c
@@ -4747,6 +4747,9 @@ Lisp_functions (FILE *inf)
}
}
+ if (strneq (dbp + 1, "cl-", 3) || strneq (dbp + 1, "CL-", 3))
+ dbp += 3;
+
if (strneq (dbp+1, "def", 3) || strneq (dbp+1, "DEF", 3))
{
dbp = skip_non_spaces (dbp);