*** empty log message ***

diff --git a/etc/ChangeLog b/etc/ChangeLog
index 105c74f2a6f8172fe03c8ad27d7566352e93c370..5532a00c1bb471ba5260ddf9e4aff008e1399af2 100644 (file)
--- a/etc/ChangeLog
+++ b/etc/ChangeLog
@@ -1,3 +1,7 @@
+2006-06-07  Kenichi Handa  <handa@m17n.org>
+
+       * NEWS: Mention how to disable character translation for a file.
+
 2006-06-04  Sven Joachim  <svenjoac@gmx.de>
 
        * de-refcard.tex: Update for Emacs 22: Use German quotes

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 23c99963e35b9c6a5e466f77a3f3fce44d891ec7..bcd1aab74a8e494d4a288d5cb9c44e3ea6338b78 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,11 @@
+2006-06-07  Kenichi Handa  <handa@m17n.org>
+
+       * international/mule.el (find-auto-coding): Don't handle the short
+       name `char-trans'.
+
+       * files.el (hack-local-variables-prop-line)
+       (hack-local-variables): Cancel the previous change.
+
 2006-06-06  Jesper Harder  <harder@phys.au.dk>
 
        * ediff-diff.el (ediff-test-utility): Protect against