From: Gerd Moellmann <gerd@gnu.org>
Date: Tue, 13 Jun 2000 23:51:46 +0000 (+0000)
Subject: *** empty log message ***
X-Git-Tag: emacs-pretest-21.0.90~3333
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=25fa6debbea3ba1ac14ae834736340de85a44317;p=emacs.git

*** empty log message ***
---

diff --git a/etc/NEWS b/etc/NEWS
index fd2b817a496..0751469e9bd 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -1222,6 +1222,10 @@ functionality with aliases for the mldrag functions.
 * Lisp changes made after edition 2.6 of the Emacs Lisp Manual,
 (Display-related features are described in a page of their own below.)
 
+** If the variable `message-truncate-lines' is bound to t around a
+call to `message', the echo area will not be resized to display that
+message; it will be truncated instead.
+
 ** The variable line-number-display-limit can now be set to nil,
 meaning no limit.
 
diff --git a/src/ChangeLog b/src/ChangeLog
index acfdcff4338..bc8dbe3b919 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,22 @@
+2000-06-14  Gerd Moellmann  <gerd@gnu.org>
+
+	* xdisp.c (message_truncate_lines, Qmessage_truncate_lines): New
+	variables.
+	(ensure_echo_area_buffers): Initialize echo buffer's
+	truncate lines setting to nil.
+	(with_echo_area_buffer): Don't set the echo buffer's truncate
+	lines setting here.
+	(set_message_1): Set it here, instead, based on the value
+	of message_truncate_lines.
+	(resize_mini_window): Handle case that lines are truncated.
+	(syms_of_xdisp): Initialize Qmessage_truncate_lines.  DEFVAR_BOOL
+	message-truncate-lines.
+
+	* keyboard.c (read_char): Bind message-truncate-lines to t
+	while displaying a help-echo.
+
+	* lisp.h (Qmessage_truncate_lines): External declaration.
+
 2000-06-13  Gerd Moellmann  <gerd@gnu.org>
 
 	* xdisp.c (Vline_number_display_limit): Renamed from