Mercurial > emacs
comparison 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 |
comparison
equal
deleted
inserted
replaced
| 104276:2c69ae7c48d0 | 104277:affb617d6101 |
|---|---|
| 1 2009-08-15 Michael Kifer <kifer@cs.stonybrook.edu> | |
| 2 | |
| 3 * viper-cmd.el (viper-insert-isearch-string): new function. | |
| 4 (viper-if-string): redefine C-s in the minibuffer to insert the last | |
| 5 incremental search string. | |
| 6 | |
| 7 * ediff-init.el (ediff-coding-system): use escape-quoted in case of | |
| 8 XEmacs. | |
| 9 | |
| 10 * ediff-merg.el (ediff-merge-region-is-non-clash-to-skip, | |
| 11 ediff-merge-region-is-non-clash, | |
| 12 ediff-skip-merge-region-if-changed-from-default-p): use defun. | |
| 13 Also check if the job is really a merge job. | |
| 14 | |
| 15 * ediff.el (ediff-current-file): new function. | |
| 16 | |
| 1 2009-08-15 Chong Yidong <cyd@stupidchicken.com> | 17 2009-08-15 Chong Yidong <cyd@stupidchicken.com> |
| 2 | 18 |
| 3 * progmodes/js.el: Edit docstrings throughout to follow Emacs | 19 * progmodes/js.el: Edit docstrings throughout to follow Emacs |
| 4 conventions. | 20 conventions. |
| 5 (js-insert-and-indent): Function deleted. | 21 (js-insert-and-indent): Function deleted. |