(basic-save-buffer): Set buffer-file-coding-system to

the coding system actually used for saving.

diff --git a/lisp/files.el b/lisp/files.el
index 102f0d3ba4f89a562072a5117d5b84fbb11b8b7a..ad4e7708ebf344f2e8cceab5f99b7be1d8e1b1ba 100644 (file)
--- a/lisp/files.el
+++ b/lisp/files.el
@@ -2181,6 +2181,10 @@ After saving the buffer, run `after-save-hook'."
                ;; If a hook returned t, file is already "written".
                ;; Otherwise, write it the usual way now.
                (setq setmodes (basic-save-buffer-1)))
+           ;; Now we have saved the current buffer.  Let's make sure
+           ;; that buffer-file-coding-system is fixed to what
+           ;; actually used for saving by binding it locally.
+           (setq buffer-file-coding-system last-coding-system-used)
            (setq buffer-file-number
                  (nthcdr 10 (file-attributes buffer-file-name)))
            (if setmodes