# HG changeset patch
# User Gerd Moellmann <gerd@gnu.org>
# Date 978445232 0
# Node ID 80882632a23ded7205386252cca5eb96f0151f16
# Parent  a16dc29a46c7a1a0bbdf19a20ab23fa555ad8577
*** empty log message ***

diff -r a16dc29a46c7 -r 80882632a23d etc/NEWS
--- a/etc/NEWS	Tue Jan 02 14:20:09 2001 +0000
+++ b/etc/NEWS	Tue Jan 02 14:20:32 2001 +0000
@@ -992,8 +992,8 @@
 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 -r a16dc29a46c7 -r 80882632a23d lisp/ChangeLog
--- a/lisp/ChangeLog	Tue Jan 02 14:20:09 2001 +0000
+++ b/lisp/ChangeLog	Tue Jan 02 14:20:32 2001 +0000
@@ -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 -r a16dc29a46c7 -r 80882632a23d src/ChangeLog
--- a/src/ChangeLog	Tue Jan 02 14:20:09 2001 +0000
+++ b/src/ChangeLog	Tue Jan 02 14:20:32 2001 +0000
@@ -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.