From: Eli Zaretskii <eliz@gnu.org>
Date: Sun, 19 Oct 2008 08:25:25 +0000 (+0000)
Subject: (ediff-make-temp-file): Unconditionally bind coding-system-for-write
X-Git-Tag: emacs-pretest-23.0.90~2388
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=f9fc24a60e236590b4e5a9f7f9805fd15e552bba;p=emacs.git

(ediff-make-temp-file): Unconditionally bind coding-system-for-write
to ediff-coding-system-for-write.
---

diff --git a/lisp/ediff-util.el b/lisp/ediff-util.el
index 8705c243d34..c9de700f234 100644
--- a/lisp/ediff-util.el
+++ b/lisp/ediff-util.el
@@ -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))