diff options
Diffstat (limited to 'lisp/ediff-util.el')
| -rw-r--r-- | lisp/ediff-util.el | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/lisp/ediff-util.el b/lisp/ediff-util.el index decff4474d4..e60faa0a0da 100644 --- a/lisp/ediff-util.el +++ b/lisp/ediff-util.el @@ -3164,7 +3164,11 @@ Hit \\[ediff-recenter] to reset the windows afterward." (defun ediff-make-temp-file (buff &optional prefix given-file start end) (let* ((p (ediff-convert-standard-filename (or prefix "ediff"))) (short-p p) - (coding-system-for-write ediff-coding-system-for-write) + (coding-system-for-write + (ediff-with-current-buffer buff + (if (boundp 'buffer-file-coding-system) + buffer-file-coding-system + ediff-coding-system-for-write))) f short-f) (if (and (fboundp 'msdos-long-file-names) (not (msdos-long-file-names)) |