[Emacs-diffs] Changes to emacs/lisp/files.el

[Chong Yidong]

Index: emacs/lisp/files.el
diff -u emacs/lisp/files.el:1.815 emacs/lisp/files.el:1.816
--- emacs/lisp/files.el:1.815   Mon Feb 27 01:53:28 2006
+++ emacs/lisp/files.el Wed Mar  8 02:24:47 2006
@@ -2404,9 +2404,13 @@
          (when (and (= char ?!) unsafe-vars)
            (dolist (elt unsafe-vars)
              (add-to-list 'safe-local-variable-values elt))
-           (customize-save-variable
-            'safe-local-variable-values
-            safe-local-variable-values))
+           ;; When this is called from desktop-restore-file-buffer,
+           ;; coding-system-for-read may be non-nil.  Reset it before
+           ;; writing to .emacs.
+           (let ((coding-system-for-read nil))
+             (customize-save-variable
+              'safe-local-variable-values
+              safe-local-variable-values)))
          (kill-buffer buf)
          (or (= char ?!)
              (= char ?\s)