[Emacs-diffs] Changes to emacs/lisp/ediff-util.el,v

[Michael Kifer]

CVSROOT:        /cvsroot/emacs
Module name:    emacs
Changes by:     Michael Kifer <kifer>   07/08/19 13:47:10

Index: ediff-util.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/ediff-util.el,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -b -r1.73 -r1.74
--- ediff-util.el       26 Jul 2007 05:26:22 -0000      1.73
+++ ediff-util.el       19 Aug 2007 13:47:08 -0000      1.74
@@ -3164,7 +3164,11 @@
 (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))