aboutsummaryrefslogtreecommitdiffstats
path: root/lisp/ediff-util.el
diff options
context:
space:
mode:
authorEli Zaretskii <[email protected]>2008-10-19 08:25:25 +0000
committerEli Zaretskii <[email protected]>2008-10-19 08:25:25 +0000
commitf9fc24a60e236590b4e5a9f7f9805fd15e552bba (patch)
treecdf370983ef82075253ac661b72b59311fe5916c /lisp/ediff-util.el
parent595072327af6b78ad79beb9413572d2d032f9293 (diff)
(ediff-make-temp-file): Unconditionally bind coding-system-for-write
to ediff-coding-system-for-write.
Diffstat (limited to 'lisp/ediff-util.el')
-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 8705c243d3..c9de700f23 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))