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-mult.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-mult.el')
| -rw-r--r-- | lisp/ediff-mult.el | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/lisp/ediff-mult.el b/lisp/ediff-mult.el index 2246426a741..206ef40351b 100644 --- a/lisp/ediff-mult.el +++ b/lisp/ediff-mult.el @@ -187,7 +187,15 @@ This can be toggled with `ediff-toggle-filename-truncation'." "*Hooks run just after the registry control panel is set up." :type 'hook :group 'ediff-mult) -(defcustom ediff-session-group-setup-hook nil + +(defcustom ediff-before-session-group-setup-hooks nil + "*Hooks to run before Ediff arranges the window for group-level operations. +It is used by commands such as ediff-directories. +This hook can be used to save the previous window config, which can be restored +on ediff-quit, ediff-suspend, or ediff-quit-session-group-hook." + :type 'hook + :group 'ediff-hook) +(defcustom ediff-after-session-group-setup-hook nil "*Hooks run just after a meta-buffer controlling a session group, such as ediff-directories, is run." :type 'hook @@ -706,7 +714,7 @@ behavior." (if (eq ediff-metajob-name 'ediff-registry) (run-hooks 'ediff-registry-setup-hook) - (run-hooks 'ediff-session-group-setup-hook)) + (run-hooks 'ediff-after-session-group-setup-hook)) ) ; eval in meta-buffer meta-buffer)) @@ -1719,6 +1727,7 @@ all marked sessions must be active." (defun ediff-show-meta-buffer (&optional meta-buf session-number) "Show the session group buffer." (interactive) + (run-hooks 'ediff-before-directory-setup-hooks) (let (wind frame silent) (if meta-buf (setq silent t)) |