Mercurial > emacs
diff man/ediff.texi @ 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 | 95bdbefcdac6 |
children | 9fd41b036b84 |
line wrap: on
line diff
--- a/man/ediff.texi Sat Oct 28 21:30:03 2000 +0000 +++ b/man/ediff.texi Sun Oct 29 04:56:45 2000 +0000 @@ -14,7 +14,7 @@ @synindex fn cp @synindex pg cp -@dircategory Emacs +@dircategory Editors @direntry * Ediff: (ediff). A visual interface for comparing and merging programs. @end direntry @@ -55,7 +55,7 @@ @vskip 0pt plus 1filll @noindent -Copyright @copyright{} 1995, 1996, 1997 Free Software Foundation, Inc. +Copyright @copyright{} 1995, 1996, 1997, 1998, 1999, 2000 Free Software Foundation, Inc. Permission is granted to make and distribute verbatim copies of this manual provided the copyright notice and this permission notice @@ -1077,6 +1077,11 @@ @vindex ediff-load-hook This hook can be used to change defaults after Ediff is loaded. +@item ediff-before-setup-hook +@vindex ediff-before-setup-hook +Hook that is run just before Ediff rearranges windows to its liking. +Can be used to save windows configuration. + @item ediff-keymap-setup-hook @vindex ediff-keymap-setup-hook @vindex ediff-mode-map @@ -1092,8 +1097,9 @@ @vindex ediff-before-setup-windows-hook @vindex ediff-after-setup-windows-hook These two hooks are called before and after Ediff sets up its window -configuration. Can be used to save the configuration that existed -before Ediff starts or for whatever other purposes. +configuration. These hooks are run each time Ediff rearranges windows to +its liking. This happens whenever it detects that the user changed the +windows setup. @item ediff-suspend-hook @itemx ediff-quit-hook @@ -1186,8 +1192,13 @@ @vindex ediff-registry-setup-hook Hooks run after setting up the registry for all active Ediff session. @xref{Session Groups}, for details. -@item ediff-session-group-setup-hook -@vindex ediff-session-group-setup-hook +@item ediff-before-session-group-setup-hook +@vindex ediff-before-session-group-setup-hook +Hooks run before setting up a control panel for a group of related Ediff +sessions. Can be used, for example, to save window configuration to restore +later. +@item ediff-after-session-group-setup-hook +@vindex ediff-after-session-group-setup-hook Hooks run after setting up a control panel for a group of related Ediff sessions. @xref{Session Groups}, for details. @item ediff-quit-session-group-hook @@ -2009,10 +2020,9 @@ @end example Apart from the standard @file{vc.el}, Ediff supports three other interfaces -to version control: -@file{rcs.el}, @file{pcl-cvs.el}, and @file{generic-sc.el}. -The package @file{rcs.el} is written by Sebastian Kremer -<sk@@thp.Uni-Koeln.DE> and is available as +to version control: @file{rcs.el}, @file{pcl-cvs.el} (recently renamed +pcvs.el), and @file{generic-sc.el}. The package @file{rcs.el} is written +by Sebastian Kremer <sk@@thp.Uni-Koeln.DE> and is available as @example @file{ftp.cs.buffalo.edu:pub/Emacs/rcs.tar.Z} @file{ftp.uni-koeln.de:/pub/gnu/emacs/rcs.tar.Z} @@ -2293,6 +2303,7 @@ Martin Maechler (maechler@@stat.math.ethz.ch), Simon Marshall (simon@@gnu.org), Richard Mlynarik (mly@@adoc.xerox.com), +Stefan Monnier (monnier@@cs.yale.edu), Chris Murphy (murphycm@@sun.aston.ac.uk), Erik Naggum (erik@@naggum.no), Eyvind Ness (Eyvind.Ness@@hrp.no), @@ -2323,6 +2334,7 @@ Philippe Waroquiers (philippe.waroquiers@@eurocontrol.be), Klaus Weber (gizmo@@zork.north.de), Ben Wing (ben@@xemacs.org), +Tom Wurgler (twurgler@@goodyear.com), Ilya Zakharevich (ilya@@math.ohio-state.edu), Eli Zaretskii (eliz@@is.elta.co.il) @end example