diff options
| author | Eli Zaretskii <eliz@gnu.org> | 2008-10-19 08:24:49 +0000 |
|---|---|---|
| committer | Eli Zaretskii <eliz@gnu.org> | 2008-10-19 08:24:49 +0000 |
| commit | 595072327af6b78ad79beb9413572d2d032f9293 (patch) | |
| tree | f78d50c3109166145c218805c19efde3994e2b04 /lisp/ediff-init.el | |
| parent | e9f5524eda42f353cd97f5cfbe534330b5ba8015 (diff) | |
| download | emacs-595072327af6b78ad79beb9413572d2d032f9293.tar.gz | |
(ediff-coding-system-for-read): Doc fix.
(ediff-coding-system-for-write): Set to emacs-internal.
Diffstat (limited to 'lisp/ediff-init.el')
| -rw-r--r-- | lisp/ediff-init.el | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/lisp/ediff-init.el b/lisp/ediff-init.el index a3dd91b2fce..2dc021380de 100644 --- a/lisp/ediff-init.el +++ b/lisp/ediff-init.el @@ -719,17 +719,17 @@ appropriate symbol: `rcs', `pcl-cvs', or `generic-sc' if you so desire." (defcustom ediff-coding-system-for-read 'raw-text "*The coding system for read to use when running the diff program as a subprocess. -In most cases, the default will do. However, under certain circumstances in -Windows NT/98/95 you might need to use something like 'raw-text-dos here. +In most cases, the default will do. However, under certain circumstances in +MS-Windows you might need to use something like 'raw-text-dos here. So, if the output that your diff program sends to Emacs contains extra ^M's, you might need to experiment here, if the default or 'raw-text-dos doesn't work." :type 'symbol :group 'ediff) -(defcustom ediff-coding-system-for-write 'no-conversion +(defcustom ediff-coding-system-for-write 'emacs-internal "*The coding system for write to use when writing out difference regions -to temp files when Ediff needs to find fine differences." +to temp files in buffer jobs and when Ediff needs to find fine differences." :type 'symbol :group 'ediff) |