Mercurial > emacs
diff lisp/ChangeLog @ 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 | 3bf815184a6c |
| children | e78ba806456a |
line wrap: on
line diff
--- a/lisp/ChangeLog Sat Aug 15 01:13:18 2009 +0000 +++ b/lisp/ChangeLog Sat Aug 15 05:57:08 2009 +0000 @@ -1,3 +1,19 @@ +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. + 2009-08-15 Chong Yidong <cyd@stupidchicken.com> * progmodes/js.el: Edit docstrings throughout to follow Emacs