diff options
| author | Eli Zaretskii | 2012-11-17 20:00:16 +0200 |
|---|---|---|
| committer | Eli Zaretskii | 2012-11-17 20:00:16 +0200 |
| commit | cf2d22b874ca2df0072e32ee641e8efffe4abd6d (patch) | |
| tree | 1795142ec7861fc85c61adc90f03265b69041556 /src/editfns.c | |
| parent | 3c4ca7155293ffc2d04708007131bcbc882d8913 (diff) | |
| parent | 6ad30855c02908fdd99d9b11943719e185e65ee3 (diff) | |
| download | emacs-cf2d22b874ca2df0072e32ee641e8efffe4abd6d.tar.gz emacs-cf2d22b874ca2df0072e32ee641e8efffe4abd6d.zip | |
Merge from trunk.
Diffstat (limited to 'src/editfns.c')
| -rw-r--r-- | src/editfns.c | 4 |
1 files changed, 2 insertions, 2 deletions
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; | |||
| 3434 | 3434 | ||
| 3435 | DEFUN ("message", Fmessage, Smessage, 1, MANY, 0, | 3435 | DEFUN ("message", Fmessage, Smessage, 1, MANY, 0, |
| 3436 | doc: /* Display a message at the bottom of the screen. | 3436 | doc: /* Display a message at the bottom of the screen. |
| 3437 | The message also goes into the `*Messages*' buffer. | 3437 | The message also goes into the `*Messages*' buffer, if `message-log-max' |
| 3438 | \(In keyboard macros, that's all it does.) | 3438 | is non-nil. (In keyboard macros, that's all it does.) |
| 3439 | Return the message. | 3439 | Return the message. |
| 3440 | 3440 | ||
| 3441 | The first argument is a format control string, and the rest are data | 3441 | The first argument is a format control string, and the rest are data |