aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorJohn Paul Wallington2008-06-04 14:07:53 +0000
committerJohn Paul Wallington2008-06-04 14:07:53 +0000
commit4ba5063490ddcadfa35b49675b76c2b67b37b984 (patch)
tree918243e1314b0bd7561ab09c342331210bda4b32 /src
parentfe4f86953e1dd494ca50c10cae4706fa21caf7c5 (diff)
downloademacs-4ba5063490ddcadfa35b49675b76c2b67b37b984.tar.gz
emacs-4ba5063490ddcadfa35b49675b76c2b67b37b984.zip
(Fdefmacro): Doc fix.
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog4
-rw-r--r--src/eval.c7
2 files changed, 10 insertions, 1 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 95098272967..673c3c012ca 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
12008-06-04 John Paul Wallington <jpw@pobox.com>
2
3 * eval.c (Fdefmacro): Doc fix.
4
12008-06-04 Kenichi Handa <handa@m17n.org> 52008-06-04 Kenichi Handa <handa@m17n.org>
2 6
3 * coding.c (detect_coding): Fix handling of coding->head_ascii. 7 * coding.c (detect_coding): Fix handling of coding->head_ascii.
diff --git a/src/eval.c b/src/eval.c
index 076ac91cb6f..e1e0a476662 100644
--- a/src/eval.c
+++ b/src/eval.c
@@ -706,7 +706,8 @@ the list ARGS... as it appears in the expression,
706and the result should be a form to be evaluated instead of the original. 706and the result should be a form to be evaluated instead of the original.
707 707
708DECL is a declaration, optional, which can specify how to indent 708DECL is a declaration, optional, which can specify how to indent
709calls to this macro and how Edebug should handle it. It looks like this: 709calls to this macro, how Edebug should handle it, and which argument
710should be treated as documentation. It looks like this:
710 (declare SPECS...) 711 (declare SPECS...)
711The elements can look like this: 712The elements can look like this:
712 (indent INDENT) 713 (indent INDENT)
@@ -715,6 +716,10 @@ The elements can look like this:
715 (debug DEBUG) 716 (debug DEBUG)
716 Set NAME's `edebug-form-spec' property to DEBUG. (This is 717 Set NAME's `edebug-form-spec' property to DEBUG. (This is
717 equivalent to writing a `def-edebug-spec' for the macro.) 718 equivalent to writing a `def-edebug-spec' for the macro.)
719
720 (doc-string ELT)
721 Set NAME's `doc-string-elt' property to ELT.
722
718usage: (defmacro NAME ARGLIST [DOCSTRING] [DECL] BODY...) */) 723usage: (defmacro NAME ARGLIST [DOCSTRING] [DECL] BODY...) */)
719 (args) 724 (args)
720 Lisp_Object args; 725 Lisp_Object args;