diff options
| author | Glenn Morris | 2011-09-24 19:30:31 -0700 |
|---|---|---|
| committer | Glenn Morris | 2011-09-24 19:30:31 -0700 |
| commit | 32bbb17c0e9e4b6326232466dbb9458b074b27da (patch) | |
| tree | dc3c125e1e2fe875dc2e8fcef6367e8d54033a35 /src | |
| parent | 728518c3e476131e09848e44570709f81c7d8b09 (diff) | |
| download | emacs-32bbb17c0e9e4b6326232466dbb9458b074b27da.tar.gz emacs-32bbb17c0e9e4b6326232466dbb9458b074b27da.zip | |
* src/buffer.c (truncate-lines): Doc fix.
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 4 | ||||
| -rw-r--r-- | src/buffer.c | 4 |
2 files changed, 7 insertions, 1 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index eff52db15a2..5c51023211b 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,3 +1,7 @@ | |||
| 1 | 2011-09-25 Glenn Morris <rgm@gnu.org> | ||
| 2 | |||
| 3 | * buffer.c (truncate-lines): Doc fix. | ||
| 4 | |||
| 1 | 2011-09-24 Chong Yidong <cyd@stupidchicken.com> | 5 | 2011-09-24 Chong Yidong <cyd@stupidchicken.com> |
| 2 | 6 | ||
| 3 | * window.c (Fwindow_prev_buffers, Fset_window_prev_buffers) | 7 | * window.c (Fwindow_prev_buffers, Fset_window_prev_buffers) |
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. |