*** empty log message ***

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 2a348be896a7038f3c268763d539f10e14426d31..baaedadab6afcbda99587deca14b010016d0d765 100644 (file)
--- 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 70afeb5892c2adefd5bf65e038f0930eec28b83e..4e378dc1852c080a09d23a5fcf2ce05e27b36136 100644 (file)
--- 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.