* src/editfns.c (Fmessage): Mention message-log-max. (Bug#12849)

diff --git a/src/ChangeLog b/src/ChangeLog
index d2e7a96f275af18ce79f4c99eabdd4df1ab7cfdf..b218e42b3f2f71ff3602abf6a16ea0bff9d65487 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+2012-11-16  Glenn Morris  <rgm@gnu.org>
+
+       * editfns.c (Fmessage): Mention message-log-max.  (Bug#12849)
+
 2012-11-15  Stefan Monnier  <monnier@iro.umontreal.ca>
 
        * eval.c (Finteractive_p): Revert lexbind-merge mishap.

diff --git a/src/editfns.c b/src/editfns.c
index c5d4ed295ab05cde25b4c41d3864b9f221b888d8..8122ffdd0d46c8e039ec9ee10596313d44316c5c 100644 (file)
--- a/src/editfns.c
+++ b/src/editfns.c
@@ -3434,8 +3434,8 @@ static ptrdiff_t message_length;
 
 DEFUN ("message", Fmessage, Smessage, 1, MANY, 0,
        doc: /* Display a message at the bottom of the screen.
-The message also goes into the `*Messages*' buffer.
-\(In keyboard macros, that's all it does.)
+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.
 
 The first argument is a format control string, and the rest are data