summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGlenn Morris <rgm@gnu.org>2012-11-15 21:40:54 -0500
committerGlenn Morris <rgm@gnu.org>2012-11-15 21:40:54 -0500
commitd56f2e49b2353336e853025219440c3e1572524e (patch)
treec5207be71fe6a33c0569fb448a8acfc15225f698
parent662b0ee67c701dbae7c15094e2d6d3d64dfe5e8e (diff)
downloademacs-d56f2e49b2353336e853025219440c3e1572524e.tar.gz
* src/editfns.c (Fmessage): Mention message-log-max. (Bug#12849)
-rw-r--r--src/ChangeLog4
-rw-r--r--src/editfns.c4
2 files changed, 6 insertions, 2 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index d2e7a96f275..b218e42b3f2 100644
--- 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 c5d4ed295ab..8122ffdd0d4 100644
--- 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