summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--doc/lispref/ChangeLog4
-rw-r--r--doc/lispref/macros.texi3
2 files changed, 7 insertions, 0 deletions
diff --git a/doc/lispref/ChangeLog b/doc/lispref/ChangeLog
index 1365e016cca..3758c3e97b0 100644
--- a/doc/lispref/ChangeLog
+++ b/doc/lispref/ChangeLog
@@ -1,3 +1,7 @@
+2012-01-07 Lars Magne Ingebrigtsen <larsi@gnus.org>
+
+ * macros.texi (Defining Macros): Document `doc-string' (bug#9668).
+
2012-01-06 Chong Yidong <cyd@gnu.org>
* variables.texi (Directory Local Variables): Document
diff --git a/doc/lispref/macros.texi b/doc/lispref/macros.texi
index 1e4dfa54191..a8b941bba89 100644
--- a/doc/lispref/macros.texi
+++ b/doc/lispref/macros.texi
@@ -239,6 +239,9 @@ Specify how to step through macro calls for Edebug.
@item (indent @var{indent-spec})
Specify how to indent calls to this macro. @xref{Indenting Macros},
for more details.
+
+@item (doc-string @var{number})
+Specify which element of the macro is the doc string, if any.
@end table
A @code{declare} form only has its special effect in the body of a