Merge r21-4-14-chise-b1.

[chise/xemacs-chise.git.1] / lisp / files.el

diff --git a/lisp/files.el b/lisp/files.el
index 1432eb5..1c2aa6f 100644 (file)
--- a/lisp/files.el
+++ b/lisp/files.el
@@ -2726,7 +2726,14 @@ Revert only if they differ."
                    ;; The resultant buffer is identical, alter
                    ;; modtime, update mods and exit
                    (set-visited-file-modtime)
-                   (after-find-file nil nil t t t))
+                   (after-find-file nil nil t t t)
+                   ;; We preserved modes above so fixup the local
+                   ;; variables manually
+                   (condition-case err
+                       (hack-local-variables)
+                     (error (lwarn 'local-variables 'warning
+                              "File local-variables error: %s"
+                              (error-message-string err)))))
                   (t t))
             t)))))