diff options
| author | Kenichi Handa | 2011-09-27 11:18:32 +0900 |
|---|---|---|
| committer | Kenichi Handa | 2011-09-27 11:18:32 +0900 |
| commit | 9aa99d0176c2021194f38eb27668395cd242395f (patch) | |
| tree | 7a297fd59f2f77833e94d3b0f8ce84d89d3f413c /src/buffer.c | |
| parent | dd7aa8dd07c456d5519194c279a808213b63cb3d (diff) | |
| parent | d594cb6163558c29797f8fc6939666574ea4a617 (diff) | |
| download | emacs-9aa99d0176c2021194f38eb27668395cd242395f.tar.gz emacs-9aa99d0176c2021194f38eb27668395cd242395f.zip | |
merge trunk
Diffstat (limited to 'src/buffer.c')
| -rw-r--r-- | src/buffer.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/buffer.c b/src/buffer.c index 37d2975c8c7..dffdeb536fc 100644 --- a/src/buffer.c +++ b/src/buffer.c | |||
| @@ -5493,7 +5493,9 @@ Instead, give each line of text just one screen line. | |||
| 5493 | 5493 | ||
| 5494 | Note that this is overridden by the variable | 5494 | Note that this is overridden by the variable |
| 5495 | `truncate-partial-width-windows' if that variable is non-nil | 5495 | `truncate-partial-width-windows' if that variable is non-nil |
| 5496 | and this buffer is not full-frame width. */); | 5496 | and this buffer is not full-frame width. |
| 5497 | |||
| 5498 | Minibuffers set this variable to nil. */); | ||
| 5497 | 5499 | ||
| 5498 | DEFVAR_PER_BUFFER ("word-wrap", &BVAR (current_buffer, word_wrap), Qnil, | 5500 | DEFVAR_PER_BUFFER ("word-wrap", &BVAR (current_buffer, word_wrap), Qnil, |
| 5499 | doc: /* *Non-nil means to use word-wrapping for continuation lines. | 5501 | doc: /* *Non-nil means to use word-wrapping for continuation lines. |