comparison lisp/ediff-init.el @ 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 c3512b2085a0
children d42aff5ca541
comparison
equal deleted inserted replaced
98854:3045af7ce2cb 98855:4b84377f2f72
717 :type 'symbol 717 :type 'symbol
718 :group 'ediff) 718 :group 'ediff)
719 719
720 (defcustom ediff-coding-system-for-read 'raw-text 720 (defcustom ediff-coding-system-for-read 'raw-text
721 "*The coding system for read to use when running the diff program as a subprocess. 721 "*The coding system for read to use when running the diff program as a subprocess.
722 In most cases, the default will do. However, under certain circumstances in 722 In most cases, the default will do. However, under certain circumstances in
723 Windows NT/98/95 you might need to use something like 'raw-text-dos here. 723 MS-Windows you might need to use something like 'raw-text-dos here.
724 So, if the output that your diff program sends to Emacs contains extra ^M's, 724 So, if the output that your diff program sends to Emacs contains extra ^M's,
725 you might need to experiment here, if the default or 'raw-text-dos doesn't 725 you might need to experiment here, if the default or 'raw-text-dos doesn't
726 work." 726 work."
727 :type 'symbol 727 :type 'symbol
728 :group 'ediff) 728 :group 'ediff)
729 729
730 (defcustom ediff-coding-system-for-write 'no-conversion 730 (defcustom ediff-coding-system-for-write 'emacs-internal
731 "*The coding system for write to use when writing out difference regions 731 "*The coding system for write to use when writing out difference regions
732 to temp files when Ediff needs to find fine differences." 732 to temp files in buffer jobs and when Ediff needs to find fine differences."
733 :type 'symbol 733 :type 'symbol
734 :group 'ediff) 734 :group 'ediff)
735 735
736 736
737 (defalias 'ediff-read-event 737 (defalias 'ediff-read-event