]> git.eshelyaron.com Git - emacs.git/commitdiff
(ediff-make-temp-file): Unconditionally bind coding-system-for-write
authorEli Zaretskii <eliz@gnu.org>
Sun, 19 Oct 2008 08:25:25 +0000 (08:25 +0000)
committerEli Zaretskii <eliz@gnu.org>
Sun, 19 Oct 2008 08:25:25 +0000 (08:25 +0000)
to ediff-coding-system-for-write.

lisp/ediff-util.el

index 8705c243d34ce884a8d7f387b128dd3701a28a68..c9de700f234038fc71344d070c093c74a4bcdd3d 100644 (file)
@@ -3146,11 +3146,7 @@ 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-with-current-buffer buff
-           (if (boundp 'buffer-file-coding-system)
-               buffer-file-coding-system
-             ediff-coding-system-for-write)))
+        (coding-system-for-write ediff-coding-system-for-write)
         f short-f)
     (if (and (fboundp 'msdos-long-file-names)
             (not (msdos-long-file-names))