(hack-local-variables-prop-line)

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

diff --git a/lisp/files.el b/lisp/files.el
index a8016a0262ef5a925cfa564a5895d2eb06ce8072..b4bc8f9ffec2e87ea9fe38921989d3fcb2af44a9 100644 (file)
--- 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