diff options
| author | Eli Zaretskii | 2021-09-04 13:34:32 +0300 |
|---|---|---|
| committer | Eli Zaretskii | 2021-09-04 13:34:32 +0300 |
| commit | 0daad767047be33c0189d5e0131b126b49d35e6d (patch) | |
| tree | 892219cf9da45802f0e31184f5459d6a29525fad /src/buffer.c | |
| parent | a8de88e3300464eb382a65ea96da69f23d21ead2 (diff) | |
| download | emacs-0daad767047be33c0189d5e0131b126b49d35e6d.tar.gz emacs-0daad767047be33c0189d5e0131b126b49d35e6d.zip | |
Improve documentation of line truncation and wrapping
* doc/emacs/display.texi (Line Truncation, Visual Line Mode):
* doc/lispref/display.texi (Truncation): Document that turning on
line truncation disables wrapping, and vice versa.
* src/buffer.c (syms_of_buffer) <truncate-lines>:
* src/xdisp.c (syms_of_xdisp) <truncate-partial-width-windows>:
Warn against turning on when 'visual-line-mode' is in effect.
* lisp/simple.el (visual-line-mode): Document that this mode
disables line truncation. (Bug#29664)
Diffstat (limited to 'src/buffer.c')
| -rw-r--r-- | src/buffer.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/buffer.c b/src/buffer.c index 100ebc7e2de..4eb7ab6d6ba 100644 --- a/src/buffer.c +++ b/src/buffer.c | |||
| @@ -5805,7 +5805,10 @@ Note that this is overridden by the variable | |||
| 5805 | `truncate-partial-width-windows' if that variable is non-nil | 5805 | `truncate-partial-width-windows' if that variable is non-nil |
| 5806 | and this buffer is not full-frame width. | 5806 | and this buffer is not full-frame width. |
| 5807 | 5807 | ||
| 5808 | Minibuffers set this variable to nil. */); | 5808 | Minibuffers set this variable to nil. |
| 5809 | |||
| 5810 | Don't set this to a non-nil value when `visual-line-mode' is | ||
| 5811 | turned on, as it could produce confusing results. */); | ||
| 5809 | 5812 | ||
| 5810 | DEFVAR_PER_BUFFER ("word-wrap", &BVAR (current_buffer, word_wrap), Qnil, | 5813 | DEFVAR_PER_BUFFER ("word-wrap", &BVAR (current_buffer, word_wrap), Qnil, |
| 5811 | doc: /* Non-nil means to use word-wrapping for continuation lines. | 5814 | doc: /* Non-nil means to use word-wrapping for continuation lines. |