*** empty log message ***

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index a883ddd..9c747b9 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -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 --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index e765d47..99eea1e 100644 (file)
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -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