Mercurial > emacs
changeset 98855:4b84377f2f72
(ediff-coding-system-for-read): Doc fix.
(ediff-coding-system-for-write): Set to emacs-internal.
| author | Eli Zaretskii <eliz@gnu.org> |
|---|---|
| date | Sun, 19 Oct 2008 08:24:49 +0000 |
| parents | 3045af7ce2cb |
| children | 8559c6826b7e |
| files | lisp/ediff-init.el |
| diffstat | 1 files changed, 4 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/ediff-init.el Sun Oct 19 05:00:18 2008 +0000 +++ b/lisp/ediff-init.el Sun Oct 19 08:24:49 2008 +0000 @@ -719,17 +719,17 @@ (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)