# HG changeset patch
# User Richard M. Stallman <rms@gnu.org>
# Date 1104618594 0
# Node ID f9b36c35d6906231372379ae521fd9bbb5212c16
# Parent  285e069cecd20b2723e1b9ecec69db3d93951358
*** empty log message ***

diff -r 285e069cecd2 -r f9b36c35d690 lisp/ChangeLog
--- a/lisp/ChangeLog	Sat Jan 01 22:29:36 2005 +0000
+++ b/lisp/ChangeLog	Sat Jan 01 22:29:54 2005 +0000
@@ -1,5 +1,10 @@
 2005-01-01  Richard M. Stallman  <rms@gnu.org>
 
+	* replace.el (occur-1): If the output buffer is also an input,
+	don't kill it, rename it.
+
+	* faces.el (set-face-background, set-face-foreground): Doc fix.
+
 	* cus-face.el (custom-face-attributes): Fix :help-echo strings
 	for :foreground and :background.