Mercurial > emacs

diff lisp/ediff-init.el @ 104277:affb617d6101

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
2009-08-15 Michael Kifer <kifer@cs.stonybrook.edu> * viper-cmd.el (viper-insert-isearch-string): new function. (viper-if-string): redefine C-s in the minibuffer to insert the last incremental search string. * ediff-init.el (ediff-coding-system): use escape-quoted in case of XEmacs. * ediff-merg.el (ediff-merge-region-is-non-clash-to-skip, ediff-merge-region-is-non-clash, ediff-skip-merge-region-if-changed-from-default-p): use defun. Also check if the job is really a merge job. * ediff.el (ediff-current-file): new function.
author Michael Kifer <kifer@cs.stonybrook.edu>
date Sat, 15 Aug 2009 05:57:08 +0000
parents a9dc0e7c3f2b
children a2ee981efbec
line wrap: on
line diff
--- a/lisp/ediff-init.el	Sat Aug 15 01:13:18 2009 +0000
+++ b/lisp/ediff-init.el	Sat Aug 15 05:57:08 2009 +0000
@@ -727,7 +727,9 @@
   :type 'symbol
   :group 'ediff)
 
-(defcustom ediff-coding-system-for-write 'emacs-internal
+(defcustom ediff-coding-system-for-write (if (featurep 'xemacs)
+					     'escape-quoted
+					   'emacs-internal)
   "The coding system for write to use when writing out difference regions
 to temp files in buffer jobs and when Ediff needs to find fine differences."
   :type 'symbol