From: Gerd Moellmann <gerd@gnu.org>
Date: Tue, 31 Jul 2001 08:44:21 +0000 (+0000)
Subject: *** empty log message ***
X-Git-Tag: emacs-pretest-21.0.105~347
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=6b053e39e1da267866b17a0ce2752b888a5e526e;p=emacs.git

*** empty log message ***
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index a883dddda01..9c747b9319a 100644
--- 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 e765d478b8a..99eea1eba00 100644
--- 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