# HG changeset patch
# User Gerd Moellmann <gerd@gnu.org>
# Date 976630420 0
# Node ID ba47c94ebbc52268654f56f34166da9ba31160cf
# Parent  816fa0390935dd29638b1b9849b5e8cb5287a3ea
*** empty log message ***

diff -r 816fa0390935 -r ba47c94ebbc5 lisp/ChangeLog
--- a/lisp/ChangeLog	Tue Dec 12 14:13:13 2000 +0000
+++ b/lisp/ChangeLog	Tue Dec 12 14:13:40 2000 +0000
@@ -1,3 +1,9 @@
+2000-12-12  Gerd Moellmann  <gerd@gnu.org>
+
+	* replace.el (perform-replace): Don't use an empty match adjacent
+	to a non-empty match when computing the next match before the
+	replacement is performed.
+
 2000-12-12  Milan Zamazal  <pdm@freesoft.cz>
 
 	* progmodes/glasses.el: Use `define-minor-mode' for the minor mode
diff -r 816fa0390935 -r ba47c94ebbc5 src/ChangeLog
--- a/src/ChangeLog	Tue Dec 12 14:13:13 2000 +0000
+++ b/src/ChangeLog	Tue Dec 12 14:13:40 2000 +0000
@@ -1,5 +1,9 @@
 2000-12-12  Gerd Moellmann  <gerd@gnu.org>
 
+	* xdisp.c (setup_echo_area_for_printing, with_echo_area_buffer): 
+	Bind `inhibit-read-only' to t.
+	(unwind_with_echo_area_buffer): Use AREF.
+
 	* xfns.c (Fx_hide_tip): Simplified.
 
 	* s/freebsd.h, s/netbsd.h (GC_MARK_STACK): Use