From: John Paul Wallington <jpw@pobox.com>
Date: Wed, 4 Jun 2008 14:07:53 +0000 (+0000)
Subject: (Fdefmacro): Doc fix.
X-Git-Tag: emacs-pretest-23.0.90~5111
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=4ba5063490ddcadfa35b49675b76c2b67b37b984;p=emacs.git

(Fdefmacro): Doc fix.
---

diff --git a/src/ChangeLog b/src/ChangeLog
index 95098272967..673c3c012ca 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+2008-06-04  John Paul Wallington  <jpw@pobox.com>
+
+	* eval.c (Fdefmacro): Doc fix.
+
 2008-06-04  Kenichi Handa  <handa@m17n.org>
 
 	* 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,
 and the result should be a form to be evaluated instead of the original.
 
 DECL is a declaration, optional, which can specify how to indent
-calls to this macro and how Edebug should handle it.  It looks like this:
+calls to this macro, how Edebug should handle it, and which argument
+should be treated as documentation.  It looks like this:
   (declare SPECS...)
 The elements can look like this:
   (indent INDENT)
@@ -715,6 +716,10 @@ The elements can look like this:
   (debug DEBUG)
 	Set NAME's `edebug-form-spec' property to DEBUG.  (This is
 	equivalent to writing a `def-edebug-spec' for the macro.)
+
+  (doc-string ELT)
+	Set NAME's `doc-string-elt' property to ELT.
+
 usage: (defmacro NAME ARGLIST [DOCSTRING] [DECL] BODY...)  */)
      (args)
      Lisp_Object args;