From 62e51d535651cd8b4242aace2f53e16c82eaf6b7 Mon Sep 17 00:00:00 2001
From: Kenichi Handa <handa@m17n.org>
Date: Fri, 2 Jun 2006 06:34:41 +0000
Subject: [PATCH] (find-auto-coding): Fix previous change.

---
 lisp/ChangeLog             | 10 ++++++++++
 lisp/international/mule.el |  5 +++--
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 9014741b08a..dd2670f403e 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,13 @@
+2006-06-02  Kenichi Handa  <handa@m17n.org>
+
+	* files.el (hack-local-variables-prop-line): Ignore `char-trans'
+	as well as `coding'.
+	(hack-local-variables): Likewise.
+
+	* international/mule.el (enable-character-translation): Put
+	permanent-local and safe-local-variable properties.
+	(find-auto-coding): Handle char-trans: tag.
+
 2006-06-02  Juri Linkov  <juri@jurta.org>
 
 	* international/mule.el (sgml-html-meta-auto-coding-function):
diff --git a/lisp/international/mule.el b/lisp/international/mule.el
index e2e9ba62398..d9242f7cb5d 100644
--- a/lisp/international/mule.el
+++ b/lisp/international/mule.el
@@ -1707,6 +1707,7 @@ If nothing is specified, the return value is nil."
 	  (goto-char tail-start)
 	  (setq tail-found (or (search-forward "coding:" tail-end t)
 			       (search-forward "unibyte:" tail-end t)
+			       (search-forward "char-trans:" tail-end t)
 			       (search-forward "enable-character-translation:"
 					       tail-end t))))
 
@@ -1761,7 +1762,7 @@ If nothing is specified, the return value is nil."
 		     (re-char-trans
 		      (concat
 		       "[\r\n]" prefix
-		       "[ \t]*enable-character-translation[ \t]*:[ \t]*\\([^ \t\r\n]+\\)[ \t]*"
+		       "[ \t]*\\(enable-character-translation\\|char-trans\\)[ \t]*:[ \t]*\\([^ \t\r\n]+\\)[ \t]*"
 		       suffix "[\r\n]"))
 		     (re-end
 		      (concat "[\r\n]" prefix "[ \t]*End *:[ \t]*" suffix
@@ -1779,7 +1780,7 @@ If nothing is specified, the return value is nil."
 		  (setq coding-system (intern (match-string 1))))
 		(when (and (not char-trans)
 			   (re-search-forward re-char-trans tail-end t))
-		  (setq char-trans (match-string 1))))))
+		  (setq char-trans (match-string 2))))))
 	(if coding-system
 	    ;; If the coding-system name ends with "!", remove it and
 	    ;; set char-trans to "nil".
-- 
2.39.2