From 5050a2ef8615ee3adec0b92a8a45df2f09362515 Mon Sep 17 00:00:00 2001
From: Kenichi Handa <handa@m17n.org>
Date: Mon, 12 Jun 2000 00:03:29 +0000
Subject: [PATCH] *** empty log message ***

---
 lisp/ChangeLog |  6 ++++++
 src/ChangeLog  | 12 ++++++++++++
 2 files changed, 18 insertions(+)

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 8fbba29987f..3b2a5049cb2 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
+2000-06-12  Kenichi Handa  <handa@etl.go.jp>
+
+	* international/mule.el (set-buffer-file-coding-system): If
+	CODING-SYSTEM is nil, set buffer-file-coding-system to nil
+	unconditionally.
+
 2000-06-12  Dave Love  <fx@gnu.org>
 
 	* wid-edit.el (widget-specify-button): Really suppress the face if
diff --git a/src/ChangeLog b/src/ChangeLog
index 24705e7247a..32a2e6679f7 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,15 @@
+2000-06-12  Kenichi Handa  <handa@etl.go.jp>
+
+	* ccl.h (EMACS_CCL_H): Renamed from _CCL_H.
+
+	* charset.h (EMACS_CHARSET_H): Renamed from _CHARSET_H.
+
+	* coding.h (EMASC_CODING_H): Renamed from _CODING_H.
+
+	* composite.h (EMACS_COMPOSITE_H): Renamed from _COMPOSITE_H.
+
+	* fontset.h (EMACS_FONTSET_H): Renamed from _FONTSET_H.
+
 2000-06-11  Dave Love  <fx@gnu.org>
 
 	* systime.h (EMACS_SYSTIME_H): Renamed from _SYSTIME_H.