# HG changeset patch
# User Gerd Moellmann <gerd@gnu.org>
# Date 996569061 0
# Node ID 68bace53ad8f46811bb716bc89a79c69e91fdd89
# Parent  f76ec0e54ac26ddd15e935e120477e73c1178d1f
*** empty log message ***

diff -r f76ec0e54ac2 -r 68bace53ad8f lisp/ChangeLog
--- a/lisp/ChangeLog	Tue Jul 31 08:44:01 2001 +0000
+++ b/lisp/ChangeLog	Tue Jul 31 08:44:21 2001 +0000
@@ -1,3 +1,8 @@
+2001-07-31  Gerd Moellmann  <gerd@gnu.org>
+
+	* smerge-mode.el (smerge-mode): Check if `font-lock-mode' is bound
+	before accessing it.
+
 2001-07-30  Andreas Schwab  <schwab@suse.de>
 
 	* menu-bar.el (toggle-highlight-paren-mode): Use
diff -r f76ec0e54ac2 -r 68bace53ad8f lisp/gnus/ChangeLog
--- a/lisp/gnus/ChangeLog	Tue Jul 31 08:44:01 2001 +0000
+++ b/lisp/gnus/ChangeLog	Tue Jul 31 08:44:21 2001 +0000
@@ -1,3 +1,8 @@
+2001-07-31  Gerd Moellmann  <gerd@gnu.org>
+
+	* gnus-start.el (gnus-startup-file-coding-system): Change to
+	`emacs-mule'.
+
 2001-07-23  Katsumi Yamaoka  <yamaoka@jpl.org>
 
 	* nntp.el (nntp-request-newgroups): Use UTC date for NEWGROUPS