mirror/emacs
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2025-01-17 17:58:46 +00:00
Code Issues Releases Activity

(ediff-exec-process): For buffer jobs, bind coding-system-for-read

Browse Source 
to ediff-coding-system-for-write.
This commit is contained in:
Eli Zaretskii 2008-10-19 08:27:14 +00:00
parent f9fc24a60e
commit 95aac6d114
2 changed files with 20 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
lisp/ChangeLog
View File

@ -1,3 +1,16 @@
2008-10-19 Eli Zaretskii <eliz@gnu.org>
Fix Bug #1183:
* ediff-diff.el (ediff-exec-process): For buffer jobs, bind
coding-system-for-read to ediff-coding-system-for-write.
* ediff-util.el (ediff-make-temp-file): Unconditionally bind
coding-system-for-write to ediff-coding-system-for-write.
* ediff-init.el (ediff-coding-system-for-read): Doc fix.
(ediff-coding-system-for-write): Set to emacs-internal.
2008-10-18 Stefan Monnier <monnier@iro.umontreal.ca>
* international/mule-conf.el (emacs-internal): New coding system alias.

8
lisp/ediff-diff.el
View File

@ -1207,7 +1207,13 @@ delimiter regions"))
;; args.
(defun ediff-exec-process (program buffer synch options &rest files)
(let ((data (match-data))
(coding-system-for-read ediff-coding-system-for-read)
;; If this is a buffer job, we are diffing temporary files
;; produced by Emacs with ediff-coding-system-for-write, so
;; use the same encoding to read the results.
(coding-system-for-read
(if (string-match "buffer" (symbol-name ediff-job-name))
ediff-coding-system-for-write
ediff-coding-system-for-read))
args)
(setq args (append (split-string options) files))
(setq args (delete "" (delq nil args))) ; delete nil and "" from arguments