Mercurial > emacs
diff lisp/ediff-init.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 | 557b7595fdcc |
children | 5049026c97b1 |
line wrap: on
line diff
--- a/lisp/ediff-init.el Sat Oct 28 21:30:03 2000 +0000 +++ b/lisp/ediff-init.el Sun Oct 29 04:56:45 2000 +0000 @@ -376,10 +376,17 @@ ;; Hook variables +(defcustom ediff-before-setup-hook nil + "*Hooks to run before Ediff begins to set up windows and buffers. +This hook can be used to save the previous window config, which can be restored +on ediff-quit or ediff-suspend." + :type 'hook + :group 'ediff-hook) (defcustom ediff-before-setup-windows-hook nil "*Hooks to run before Ediff sets its window configuration. -This can be used to save the previous window config, which can be restored -on ediff-quit or ediff-suspend." +This hook is called every time when Ediff arranges its windows. +This happens each time Ediff detects that the windows were messed up by the +user." :type 'hook :group 'ediff-hook) (defcustom ediff-after-setup-windows-hook nil @@ -399,7 +406,7 @@ :type 'hook :group 'ediff-hook) (defcustom ediff-startup-hook nil - "*Hooks to run in the control buffer after Ediff has been set up." + "*Hooks to run in the control buffer after Ediff has been set up and is ready for the job." :type 'hook :group 'ediff-hook) (defcustom ediff-select-hook nil @@ -777,14 +784,14 @@ 'display-pixel-height 'x-display-pixel-height))))) -;; A-list of current-diff-overlay symbols asssociated with buf types +;; A-list of current-diff-overlay symbols associated with buf types (defconst ediff-current-diff-overlay-alist '((A . ediff-current-diff-overlay-A) (B . ediff-current-diff-overlay-B) (C . ediff-current-diff-overlay-C) (Ancestor . ediff-current-diff-overlay-Ancestor))) -;; A-list of current-diff-face-* symbols asssociated with buf types +;; A-list of current-diff-face-* symbols associated with buf types (defconst ediff-current-diff-face-alist '((A . ediff-current-diff-face-A) (B . ediff-current-diff-face-B)