diff options
| author | Michael Kifer <kifer@cs.stonybrook.edu> | 2009-08-15 05:57:08 +0000 |
|---|---|---|
| committer | Michael Kifer <kifer@cs.stonybrook.edu> | 2009-08-15 05:57:08 +0000 |
| commit | 68b962d42a9cc126759448484d23e10e2102d622 (patch) | |
| tree | ae4a046e1a8f5c540a61865f41476982f2446edc /lisp/ediff-init.el | |
| parent | 4989aff3705790be2ae7601de1fdf62b0b139b19 (diff) | |
| download | emacs-68b962d42a9cc126759448484d23e10e2102d622.tar.gz | |
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.
Diffstat (limited to 'lisp/ediff-init.el')
| -rw-r--r-- | lisp/ediff-init.el | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/lisp/ediff-init.el b/lisp/ediff-init.el index 4b637dca179..d58008f9d12 100644 --- a/lisp/ediff-init.el +++ b/lisp/ediff-init.el @@ -727,7 +727,9 @@ work." :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 |