*** empty log message ***

3 files changed, 12 insertions, 2 deletions

diff --git a/etc/NEWS b/etc/NEWS
index ec484521a27..52775904db5 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -992,8 +992,8 @@ compatibility.
 ring (history).
 
 *** The new variable `comint-input-history-ignore' is a regexp for
-identifying history lines that should be ignored, like tcsh inserts in
-time-stamp strings.  The default value of this variable is "^#".
+identifying history lines that should be ignored, like tcsh time-stamp
+strings, starting with a `#'.  The default value of this variable is "^#".
 
 ** Changes to Rmail mode
 
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 266fba7b3a4..f3ed840f31c 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
+2001-01-02  Gerd Moellmann  <gerd@gnu.org>
+
+        * comint.el (comint-input-history-ignore): New variable.
+        (comint-read-input-ring): Ignore entries matching
+        comint-input-history-ignore.
+
 2001-01-02  Eric M. Ludlam  <zappo@gnu.org>
 
         * emacs-lisp/lisp-mnt.el (lm-copyright-prefix): New Variable.
diff --git a/src/ChangeLog b/src/ChangeLog
index 230be236cac..5cf4b1d7b1c 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,9 @@
 2001-01-02  Gerd Moellmann  <gerd@gnu.org>
 
+        * xterm.c (x_connection_closed): Catch X errors around all
+        statements that call X.  Save away the error message in a local
+        copy.
+        
         * xterm.c (x_connection_closed): Set handling_signal to 0 at
         the start.