From: Gerd Moellmann <gerd@gnu.org>
Date: Tue, 20 Feb 2001 14:54:50 +0000 (+0000)
Subject: (setup_echo_area_for_printing): Set truncate_lines to
X-Git-Tag: emacs-pretest-21.0.99~266
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=ab2c5f0a5d33ad00aa02fdf0ebc7611531af1b03;p=emacs.git

(setup_echo_area_for_printing): Set truncate_lines to
nil, otherwise we're left with truncate_lines t when a message
is printed with message-truncate-lines bound to t.
---

diff --git a/src/ChangeLog b/src/ChangeLog
index 4e9cd28e026..1a5941e7026 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,9 @@
+2001-02-20  Gerd Moellmann  <gerd@gnu.org>
+
+	* xdisp.c (setup_echo_area_for_printing): Set truncate_lines to
+	nil, otherwise we're left with truncate_lines t when a message
+	is printed with message-truncate-lines bound to t.
+
 2001-02-19  Gerd Moellmann  <gerd@gnu.org>
 
 	* window.c (Fmove_to_window_line): Undo last change.
diff --git a/src/xdisp.c b/src/xdisp.c
index 4ff296d0959..b693e26bb22 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -6050,6 +6050,7 @@ setup_echo_area_for_printing (multibyte_p)
 
       /* Switch to that buffer and clear it.  */
       set_buffer_internal (XBUFFER (echo_area_buffer[0]));
+      current_buffer->truncate_lines = Qnil;
       
       if (Z > BEG)
 	{
@@ -6088,8 +6089,11 @@ setup_echo_area_for_printing (multibyte_p)
 	}
       
       if (current_buffer != XBUFFER (echo_area_buffer[0]))
-	/* Someone switched buffers between print requests.  */
-	set_buffer_internal (XBUFFER (echo_area_buffer[0]));
+	{
+	  /* Someone switched buffers between print requests.  */
+	  set_buffer_internal (XBUFFER (echo_area_buffer[0]));
+	  current_buffer->truncate_lines = Qnil;
+	}
     }
 }