diff options
| author | Michael Kifer <kifer@cs.stonybrook.edu> | 2000-10-29 04:56:45 +0000 |
|---|---|---|
| committer | Michael Kifer <kifer@cs.stonybrook.edu> | 2000-10-29 04:56:45 +0000 |
| commit | 657f9cb8b7f7c3a9687f3998319ce63346ef13a4 (patch) | |
| tree | 1ee552a157cf60e2c30151a8341d5bef0d9f9e4d /lisp/ediff-merg.el | |
| parent | 4f490d995d44a68878c1bd7dd0df3be5355b81a8 (diff) | |
| download | emacs-657f9cb8b7f7c3a9687f3998319ce63346ef13a4.tar.gz | |
2000-10-29 Michael Kifer <kifer@cs.sunysb.edu>
* viper-cmd.el (viper-preserve-cursor-color): new test that avoids
rewrawing the screen when changing cursor color.
(viper-insert-state-pre-command-sentinel,
viper-replace-state-pre-command-sentinel,
viper-replace-state-post-command-sentinel): use
viper-preserve-cursor-color.
Many functions changed to use viper= instead of = when comparing
characters.
* viper-util.el (viper-memq-char,viper=): new functions for
working with characters.
(viper-change-cursor-color): fixed buglet.
Many functions changed to use viper= instead of = when comparing
characters.
* viper.el (viper-insert-state-mode-list): added eshell.
* ediff-init.el (ediff-before-setup-hook): new hook.
Several typos fixed in various docstrings.
* ediff-merg.el (ediff-show-clashes-only): docstring typo fixed.
* ediff-nult.el (ediff-before-session-group-setup-hooks): new
hook.
(ediff-show-meta-buffer): run ediff-before-session-group-setup-hooks.
* ediff-util.el (ediff-setup): run ediff-before-setup-hook.
(ediff-other-buffer): use selected buffers if in Buffer-menu buffer.
(ediff-get-selected-buffers): new function.
* ediff-vers.el (ediff-vc-internal,ediff-rcs-internal,
ediff-vc-merge-internal,ediff-rcs-merge-internal): use
save-window-excursion.
* ediff-wind.el (ediff-skip-unsuitable-frames): more robust
termination check in while loop.
* ediff.el (ediff-get-default-file-name): better defaults when in
dired buffer.
(ediff-files,ediff-merge-files,ediff-files3,
ediff-merge-files-with-ancestor): use ediff-get-default-file-name.
Diffstat (limited to 'lisp/ediff-merg.el')
| -rw-r--r-- | lisp/ediff-merg.el | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lisp/ediff-merg.el b/lisp/ediff-merg.el index a8752ff52a1..92788ae968f 100644 --- a/lisp/ediff-merg.el +++ b/lisp/ediff-merg.el @@ -80,7 +80,7 @@ STRING4 (defcustom ediff-show-clashes-only nil "*If t, show only those diff regions where both buffers disagree with the ancestor. This means that regions that have status prefer-A or prefer-B will be -skiped over. Nil means show all regions." +skipped over. Nil means show all regions." :type 'boolean :group 'ediff-merge ) |