From 544a2a8049b9f1660134e1868a32c9e829d3c952 Mon Sep 17 00:00:00 2001 From: Xue Fuqiao Date: Sat, 5 Oct 2013 23:06:17 +0800 Subject: [PATCH] Minor doc fixes. --- doc/lispref/display.texi | 2 ++ src/ChangeLog | 4 ++++ src/editfns.c | 3 +++ 3 files changed, 9 insertions(+) diff --git a/doc/lispref/display.texi b/doc/lispref/display.texi index 8ebf440c9fe..99cbb4d3458 100644 --- a/doc/lispref/display.texi +++ b/doc/lispref/display.texi @@ -168,6 +168,7 @@ entire frame width). @end defopt @defopt truncate-partial-width-windows +@cindex partial-width windows This variable controls line truncation in @dfn{partial-width} windows. A partial-width window is one that does not occupy the entire frame width (@pxref{Splitting Windows}). If the value is @code{nil}, line @@ -235,6 +236,7 @@ This variable is automatically buffer-local in every buffer. @cindex error display @cindex echo area +@c FIXME: Why not use @xref{Minibuffers} directly? --xfq The @dfn{echo area} is used for displaying error messages (@pxref{Errors}), for messages made with the @code{message} primitive, and for echoing keystrokes. It is not the same as the minibuffer, diff --git a/src/ChangeLog b/src/ChangeLog index b503389c53d..83ef0f55906 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,7 @@ +2013-10-05 Xue Fuqiao + + * editfns.c (message): Mention batch mode in doc string. + 2013-10-05 Jan Djärv * nsterm.m (check_native_fs): Remove erroneous comment. diff --git a/src/editfns.c b/src/editfns.c index 84a5c8395fc..9847e507766 100644 --- a/src/editfns.c +++ b/src/editfns.c @@ -3419,6 +3419,9 @@ The message also goes into the `*Messages*' buffer, if `message-log-max' is non-nil. (In keyboard macros, that's all it does.) Return the message. +In batch mode, the message is printed to the standard error stream, +followed by a newline. + The first argument is a format control string, and the rest are data to be formatted under control of the string. See `format' for details. -- 2.11.4.GIT