diff options
| author | Eli Zaretskii | 2021-08-19 15:44:55 +0300 |
|---|---|---|
| committer | Eli Zaretskii | 2021-08-19 15:44:55 +0300 |
| commit | 1511f3cecce73e227a3bbcd7b4d8041fe579f908 (patch) | |
| tree | 1fa8b042db7911ded96fc8ccf902465475b71c4c | |
| parent | 787fa7a8ab3ccf12c0e7e4efafd7506999071ea5 (diff) | |
| download | emacs-1511f3cecce73e227a3bbcd7b4d8041fe579f908.tar.gz emacs-1511f3cecce73e227a3bbcd7b4d8041fe579f908.zip | |
Fix inaccuracies in documentation of 'message-truncate-lines'
* doc/lispref/display.texi (Echo Area Customization):
* src/xdisp.c (syms_of_xdisp): Adjust the documentation of
message-truncate-lines to changes that fixed bug#46718.
| -rw-r--r-- | doc/lispref/display.texi | 6 | ||||
| -rw-r--r-- | src/xdisp.c | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/doc/lispref/display.texi b/doc/lispref/display.texi index 79fb72a464d..7ab2896778d 100644 --- a/doc/lispref/display.texi +++ b/doc/lispref/display.texi | |||
| @@ -646,9 +646,9 @@ If the value is zero, then command input is not echoed. | |||
| 646 | 646 | ||
| 647 | @defvar message-truncate-lines | 647 | @defvar message-truncate-lines |
| 648 | Normally, displaying a long message resizes the echo area to display | 648 | Normally, displaying a long message resizes the echo area to display |
| 649 | the entire message. But if the variable @code{message-truncate-lines} | 649 | the entire message, wrapping long line as needed. But if the variable |
| 650 | is non-@code{nil}, the echo area does not resize, and the message is | 650 | @code{message-truncate-lines} is non-@code{nil}, long lines of |
| 651 | truncated to fit it. | 651 | echo-area message are instead truncated to fit the mini-window width. |
| 652 | @end defvar | 652 | @end defvar |
| 653 | 653 | ||
| 654 | The variable @code{max-mini-window-height}, which specifies the | 654 | The variable @code{max-mini-window-height}, which specifies the |
diff --git a/src/xdisp.c b/src/xdisp.c index 0846af268eb..e853c8c2232 100644 --- a/src/xdisp.c +++ b/src/xdisp.c | |||
| @@ -35445,7 +35445,7 @@ and `scroll-right' overrides this variable's effect. */); | |||
| 35445 | Vhscroll_step = make_fixnum (0); | 35445 | Vhscroll_step = make_fixnum (0); |
| 35446 | 35446 | ||
| 35447 | DEFVAR_BOOL ("message-truncate-lines", message_truncate_lines, | 35447 | DEFVAR_BOOL ("message-truncate-lines", message_truncate_lines, |
| 35448 | doc: /* If non-nil, messages are truncated instead of resizing the echo area. | 35448 | doc: /* If non-nil, messages are truncated when displaying the echo area. |
| 35449 | Bind this around calls to `message' to let it take effect. */); | 35449 | Bind this around calls to `message' to let it take effect. */); |
| 35450 | message_truncate_lines = false; | 35450 | message_truncate_lines = false; |
| 35451 | 35451 | ||