From: Kenichi Handa <handa@m17n.org>
Date: Wed, 7 Jun 2006 01:20:28 +0000 (+0000)
Subject: (hack-local-variables-prop-line)
X-Git-Tag: emacs-pretest-22.0.90~2042
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=1314c787ebc180b00132f1e4780f71f12d7233b5;p=emacs.git

(hack-local-variables-prop-line)
(hack-local-variables): Cancel the previous change.
---

diff --git a/lisp/files.el b/lisp/files.el
index a8016a0262e..b4bc8f9ffec 100644
--- a/lisp/files.el
+++ b/lisp/files.el
@@ -2487,12 +2487,10 @@ and VAL is the specified value."
 		 ;; case when checking for `mode' in set-auto-mode,
 		 ;; so we must do that here as well.
 		 ;; That is inconsistent, but we're stuck with it.
-		 ;; The same can be said for `coding' and `char-trans'
-		 ;; in set-auto-coding.
+		 ;; The same can be said for `coding' in set-auto-coding.
 		 (or (and (equal (downcase (symbol-name key)) "mode")
 			  (setq mode-specified t))
 		     (equal (downcase (symbol-name key)) "coding")
-		     (equal (downcase (symbol-name key)) "char-trans")
 		     (condition-case nil
 			 (push (cons (if (eq key 'eval)
 					 'eval
@@ -2582,7 +2580,7 @@ is specified, returning t if it is specified."
 		    (if mode-only
 			(if (eq var 'mode)
 			    (setq result t))
-		      (unless (or (eq var 'coding) (eq var 'char-trans))
+		      (unless (eq var 'coding)
 			(condition-case nil
 			    (push (cons (if (eq var 'eval)
 					    'eval