aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorGerd Moellmann2001-02-20 14:54:50 +0000
committerGerd Moellmann2001-02-20 14:54:50 +0000
commitab2c5f0a5d33ad00aa02fdf0ebc7611531af1b03 (patch)
tree66020583517c619ab5dde16b8bd0a39548ffa0ec /src
parentb3ae7a0a1e262405a11ee826a23867e52e099dd9 (diff)
downloademacs-ab2c5f0a5d33ad00aa02fdf0ebc7611531af1b03.tar.gz
emacs-ab2c5f0a5d33ad00aa02fdf0ebc7611531af1b03.zip
(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.
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog6
-rw-r--r--src/xdisp.c8
2 files changed, 12 insertions, 2 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 4e9cd28e026..1a5941e7026 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,9 @@
12001-02-20 Gerd Moellmann <gerd@gnu.org>
2
3 * xdisp.c (setup_echo_area_for_printing): Set truncate_lines to
4 nil, otherwise we're left with truncate_lines t when a message
5 is printed with message-truncate-lines bound to t.
6
12001-02-19 Gerd Moellmann <gerd@gnu.org> 72001-02-19 Gerd Moellmann <gerd@gnu.org>
2 8
3 * window.c (Fmove_to_window_line): Undo last change. 9 * 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)
6050 6050
6051 /* Switch to that buffer and clear it. */ 6051 /* Switch to that buffer and clear it. */
6052 set_buffer_internal (XBUFFER (echo_area_buffer[0])); 6052 set_buffer_internal (XBUFFER (echo_area_buffer[0]));
6053 current_buffer->truncate_lines = Qnil;
6053 6054
6054 if (Z > BEG) 6055 if (Z > BEG)
6055 { 6056 {
@@ -6088,8 +6089,11 @@ setup_echo_area_for_printing (multibyte_p)
6088 } 6089 }
6089 6090
6090 if (current_buffer != XBUFFER (echo_area_buffer[0])) 6091 if (current_buffer != XBUFFER (echo_area_buffer[0]))
6091 /* Someone switched buffers between print requests. */ 6092 {
6092 set_buffer_internal (XBUFFER (echo_area_buffer[0])); 6093 /* Someone switched buffers between print requests. */
6094 set_buffer_internal (XBUFFER (echo_area_buffer[0]));
6095 current_buffer->truncate_lines = Qnil;
6096 }
6093 } 6097 }
6094} 6098}
6095 6099