aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEli Zaretskii2008-10-19 08:25:25 +0000
committerEli Zaretskii2008-10-19 08:25:25 +0000
commitf9fc24a60e236590b4e5a9f7f9805fd15e552bba (patch)
treecdf370983ef82075253ac661b72b59311fe5916c
parent595072327af6b78ad79beb9413572d2d032f9293 (diff)
downloademacs-f9fc24a60e236590b4e5a9f7f9805fd15e552bba.tar.gz
emacs-f9fc24a60e236590b4e5a9f7f9805fd15e552bba.zip
(ediff-make-temp-file): Unconditionally bind coding-system-for-write
to ediff-coding-system-for-write.
-rw-r--r--lisp/ediff-util.el6
1 files changed, 1 insertions, 5 deletions
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."
3146(defun ediff-make-temp-file (buff &optional prefix given-file start end) 3146(defun ediff-make-temp-file (buff &optional prefix given-file start end)
3147 (let* ((p (ediff-convert-standard-filename (or prefix "ediff"))) 3147 (let* ((p (ediff-convert-standard-filename (or prefix "ediff")))
3148 (short-p p) 3148 (short-p p)
3149 (coding-system-for-write 3149 (coding-system-for-write ediff-coding-system-for-write)
3150 (ediff-with-current-buffer buff
3151 (if (boundp 'buffer-file-coding-system)
3152 buffer-file-coding-system
3153 ediff-coding-system-for-write)))
3154 f short-f) 3150 f short-f)
3155 (if (and (fboundp 'msdos-long-file-names) 3151 (if (and (fboundp 'msdos-long-file-names)
3156 (not (msdos-long-file-names)) 3152 (not (msdos-long-file-names))