From: Gerd Moellmann <gerd@gnu.org>
Date: Mon, 25 Sep 2000 15:07:45 +0000 (+0000)
Subject: *** empty log message ***
X-Git-Tag: emacs-pretest-21.0.90~1392
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=d8b4516f4d03ce794d1caff62558b92de622083d;p=emacs.git

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

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 2a348be896a..baaedadab6a 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2000-09-25  Gerd Moellmann  <gerd@gnu.org>
+
+	* mail/mail-utils.el (rmail-dont-reply-to): Fix last change.
+	
 2000-09-25  Dave Love  <fx@gnu.org>
 
 	* autoinsert.el (auto-insert): Doc fix.
diff --git a/src/ChangeLog b/src/ChangeLog
index 70afeb5892c..4e378dc1852 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,19 @@
 2000-09-25  Gerd Moellmann  <gerd@gnu.org>
 
+	* keyboard.c (show_help_echo): Set help_echo_showing_p.
+	(read_char): If help-echo is showing, preserve the echo area
+	when redisplaying.
+
+	* xdisp.c (help_echo_showing_p): New variable.
+	(set_message): Reset it to 0.
+	(init_xdisp): Initialize help_echo_showing_p.
+
+	* dispextern.h (help_echo_showing_p): Declare extern.
+
+	* config.in: Fix typo in __GNUC_MINOR__.
+
+	* keyboard.h (quit_throw_to_read_char): Declare NO_RETURN.
+
 	* s/freebsd.h (POSIX_SIGNALS): Define.
 
 	* xterm.c (x_clear_mouse_face): Block/unblock input.