# HG changeset patch
# User Kenichi Handa <handa@m17n.org>
# Date 1149643272 0
# Node ID 6ed7bdd0b6d955b618eb6ffdd388def44f3936fd
# Parent  824f88e88c327dc439bffd39eab082c286607460
*** empty log message ***

diff -r 824f88e88c32 -r 6ed7bdd0b6d9 etc/ChangeLog
--- a/etc/ChangeLog	Wed Jun 07 01:20:28 2006 +0000
+++ b/etc/ChangeLog	Wed Jun 07 01:21:12 2006 +0000
@@ -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 -r 824f88e88c32 -r 6ed7bdd0b6d9 lisp/ChangeLog
--- a/lisp/ChangeLog	Wed Jun 07 01:20:28 2006 +0000
+++ b/lisp/ChangeLog	Wed Jun 07 01:21:12 2006 +0000
@@ -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