Mercurial > emacs
comparison lisp/ediff-merg.el @ 33019:6306740f6938
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.
author | Michael Kifer <kifer@cs.stonybrook.edu> |
---|---|
date | Sun, 29 Oct 2000 04:56:45 +0000 |
parents | 3ec5a485d0ab |
children | 237411236185 |
comparison
equal
deleted
inserted
replaced
33018:d9abb0441663 | 33019:6306740f6938 |
---|---|
78 :group 'ediff-merge) | 78 :group 'ediff-merge) |
79 | 79 |
80 (defcustom ediff-show-clashes-only nil | 80 (defcustom ediff-show-clashes-only nil |
81 "*If t, show only those diff regions where both buffers disagree with the ancestor. | 81 "*If t, show only those diff regions where both buffers disagree with the ancestor. |
82 This means that regions that have status prefer-A or prefer-B will be | 82 This means that regions that have status prefer-A or prefer-B will be |
83 skiped over. Nil means show all regions." | 83 skipped over. Nil means show all regions." |
84 :type 'boolean | 84 :type 'boolean |
85 :group 'ediff-merge | 85 :group 'ediff-merge |
86 ) | 86 ) |
87 (make-variable-buffer-local 'ediff-show-clashes-only) | 87 (make-variable-buffer-local 'ediff-show-clashes-only) |
88 | 88 |