Mercurial > emacs
comparison lisp/ediff-init.el @ 104277:affb617d6101
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 |
comparison
equal
deleted
inserted
replaced
| 104276:2c69ae7c48d0 | 104277:affb617d6101 |
|---|---|
| 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 'emacs-internal | 730 (defcustom ediff-coding-system-for-write (if (featurep 'xemacs) |
| 731 'escape-quoted | |
| 732 'emacs-internal) | |
| 731 "The coding system for write to use when writing out difference regions | 733 "The coding system for write to use when writing out difference regions |
| 732 to temp files in buffer jobs and when Ediff needs to find fine differences." | 734 to temp files in buffer jobs and when Ediff needs to find fine differences." |
| 733 :type 'symbol | 735 :type 'symbol |
| 734 :group 'ediff) | 736 :group 'ediff) |
| 735 | 737 |