*** empty log message ***

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 8fbba29987f094d565583f75b11115582ea4173c..3b2a5049cb2e1eeb1782b991d948da1ef7187826 100644 (file)
--- 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 24705e7247a2ebe50a5365d7bc01b2abc167b94a..32a2e6679f7260b8c2281c01c84816a2ac309c1c 100644 (file)
--- 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.