aboutsummaryrefslogtreecommitdiffstats
path: root/doc/lispref
diff options
context:
space:
mode:
Diffstat (limited to 'doc/lispref')
-rw-r--r--doc/lispref/ChangeLog8
-rw-r--r--doc/lispref/internals.texi34
-rw-r--r--doc/lispref/searching.texi6
3 files changed, 36 insertions, 12 deletions
diff --git a/doc/lispref/ChangeLog b/doc/lispref/ChangeLog
index 31e4f791350..f770fb3cada 100644
--- a/doc/lispref/ChangeLog
+++ b/doc/lispref/ChangeLog
@@ -1,3 +1,11 @@
12013-04-21 Xue Fuqiao <xfq.free@gmail.com>
2
3 * internals.texi (Writing Emacs Primitives): Remove unnecessary
4 references to the sources. (Bug#13800)
5
6 * searching.texi (Regexp Backslash): Doc fix for backslash
7 constructs in regular expressions.
8
12013-04-15 Christopher Schmidt <christopher@ch.ristopher.com> 92013-04-15 Christopher Schmidt <christopher@ch.ristopher.com>
2 10
3 * tips.texi (Coding Conventions): Mention separation of package 11 * tips.texi (Coding Conventions): Mention separation of package
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
diff --git a/doc/lispref/searching.texi b/doc/lispref/searching.texi
index 87d4051d6f0..386d5bdde4c 100644
--- a/doc/lispref/searching.texi
+++ b/doc/lispref/searching.texi
@@ -589,10 +589,8 @@ through @samp{f} and @samp{A} through @samp{F}.
589 589
590 For the most part, @samp{\} followed by any character matches only 590 For the most part, @samp{\} followed by any character matches only
591that character. However, there are several exceptions: certain 591that character. However, there are several exceptions: certain
592two-character sequences starting with @samp{\} that have special 592sequences starting with @samp{\} that have special meanings. Here is
593meanings. (The character after the @samp{\} in such a sequence is 593a table of the special @samp{\} constructs.
594always ordinary when used on its own.) Here is a table of the special
595@samp{\} constructs.
596 594
597@table @samp 595@table @samp
598@item \| 596@item \|