aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--doc/lispref/ChangeLog3
-rw-r--r--doc/lispref/internals.texi34
2 files changed, 29 insertions, 8 deletions
diff --git a/doc/lispref/ChangeLog b/doc/lispref/ChangeLog
index 36c8b8dbea7..f770fb3cada 100644
--- a/doc/lispref/ChangeLog
+++ b/doc/lispref/ChangeLog
@@ -1,5 +1,8 @@
12013-04-21 Xue Fuqiao <xfq.free@gmail.com> 12013-04-21 Xue Fuqiao <xfq.free@gmail.com>
2 2
3 * internals.texi (Writing Emacs Primitives): Remove unnecessary
4 references to the sources. (Bug#13800)
5
3 * searching.texi (Regexp Backslash): Doc fix for backslash 6 * searching.texi (Regexp Backslash): Doc fix for backslash
4 constructs in regular expressions. 7 constructs in regular expressions.
5 8
diff --git a/doc/lispref/internals.texi b/doc/lispref/internals.texi
index 3269776b626..24440858b7e 100644
--- a/doc/lispref/internals.texi
+++ b/doc/lispref/internals.texi
@@ -661,15 +661,33 @@ equivalent of @code{&rest}). Both @code{UNEVALLED} and @code{MANY} are
661macros. If @var{max} is a number, it must be more than @var{min} but 661macros. If @var{max} is a number, it must be more than @var{min} but
662less than 8. 662less than 8.
663 663
664@cindex interactive specification in primitives
664@item interactive 665@item interactive
665This is an interactive specification, a string such as might be used as 666This is an interactive specification, a string such as might be used
666the argument of @code{interactive} in a Lisp function. In the case of 667as the argument of @code{interactive} in a Lisp function. In the case
667@code{or}, it is 0 (a null pointer), indicating that @code{or} cannot be 668of @code{or}, it is 0 (a null pointer), indicating that @code{or}
668called interactively. A value of @code{""} indicates a function that 669cannot be called interactively. A value of @code{""} indicates a function that should receive no
669should receive no arguments when called interactively. If the value 670arguments when called interactively. For example:
670begins with a @samp{(}, the string is evaluated as a Lisp form. 671
671For examples of the last two forms, see @code{widen} and 672@smallexample
672@code{narrow-to-region} in @file{editfns.c}. 673@group
674DEFUN ("baz", Fbaz, Sbaz, 0, 0, "",
675 doc: /* @dots{} */)
676@end group
677@end smallexample
678
679If the value begins with a @samp{"(}, the string is evaluated as a
680Lisp form. For example:
681
682@smallexample
683@group
684DEFUN ("foo", Ffoo, Sfoo, 0, UNEVALLED, "(list
685 (read-char-by-name \"Insert character (Unicode name or hex): \")\
686 (prefix-numeric-value current-prefix-arg)\
687 t))",
688 doc: /* @dots{} /*)
689@end group
690@end smallexample
673 691
674@item doc 692@item doc
675This is the documentation string. It uses C comment syntax rather 693This is the documentation string. It uses C comment syntax rather