Mercurial > emacs
view .cvsignore @ 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 | 0205517814da |
| children |
line wrap: on
line source
*.xdelta .DS_Store Makefile autom4te.cache bin boot.log boot.log.diff boot.log.old config.cache config.log config.status data emacs*.tar.gz leim*.tar.gz lock site-lisp update.log _dir-locals.el _dir-loc.el