| commit | 68b962d42a9cc126759448484d23e10e2102d622 | |
| author | Michael Kifer <kifer@cs.stonybrook.edu> | |
| Sat, 15 Aug 2009 05:57:08 +0000 (15 05:57 +0000) | ||
| committer | Michael Kifer <kifer@cs.stonybrook.edu> | |
| Sat, 15 Aug 2009 05:57:08 +0000 (15 05:57 +0000) | ||
| tree | ae4a046e1a8f5c540a61865f41476982f2446edc | treesnapshot (tar.gz zip) |
| parent | 4989aff3705790be2ae7601de1fdf62b0b139b19 | commitdiff |
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.
* 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.