summaryrefslogtreecommitdiff
path: root/lisp/ediff-util.el
diff options
context:
space:
mode:
authorEli Zaretskii <eliz@gnu.org>2008-10-19 08:25:25 +0000
committerEli Zaretskii <eliz@gnu.org>2008-10-19 08:25:25 +0000
commit033b105943bf8a0a945bb1a9aede0b5b93fe5016 (patch)
tree8aba38a40a03023d5009f10acd4db62ddccf112a /lisp/ediff-util.el
parentbd543eaaf459da93b8f77988dd9c217b40812fbc (diff)
downloademacs-033b105943bf8a0a945bb1a9aede0b5b93fe5016.tar.gz
(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 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))