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 @@
+2011-09-25  Glenn Morris  <rgm@gnu.org>
+
+        * buffer.c (truncate-lines): Doc fix.
+
 2011-09-24  Chong Yidong  <cyd@stupidchicken.com>
 
         * 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.
 
 Note that this is overridden by the variable
 `truncate-partial-width-windows' if that variable is non-nil
-and this buffer is not full-frame width.  */);
+and this buffer is not full-frame width.
+
+Minibuffers set this variable to nil.  */);
 
   DEFVAR_PER_BUFFER ("word-wrap", &BVAR (current_buffer, word_wrap), Qnil,
                      doc: /* *Non-nil means to use word-wrapping for continuation lines.