Mercurial > emacs
changeset 71383:4a969fe4cb19
2006-06-18 Michael Kifer <kifer@cs.stonybrook.edu>
some typo fixes
| author | Michael Kifer <kifer@cs.stonybrook.edu> |
|---|---|
| date | Sun, 18 Jun 2006 17:12:16 +0000 |
| parents | 4033086b16b6 |
| children | 9853142939b3 |
| files | man/ediff.texi |
| diffstat | 1 files changed, 12 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/man/ediff.texi Sun Jun 18 17:08:24 2006 +0000 +++ b/man/ediff.texi Sun Jun 18 17:12:16 2006 +0000 @@ -1614,6 +1614,9 @@ ignoring letter case or not. It can be set in @file{.emacs} using @code{setq-default}. +When case sensitivity is toggled, all difference +regions are recomputed. + @node Highlighting Difference Regions, Narrowing, Selective Browsing, Customization @section Highlighting Difference Regions @@ -2316,6 +2319,14 @@ Using @code{ediff-cleanup-hook}, one can make Ediff delete the variants unconditionally (e.g., by making @code{ediff-janitor} into one of these hooks). + +@item ediff-keep-tmp-versions +@vindex @code{ediff-keep-tmp-versions} +Default is @code{nil}. If @code{t}, the versions of the files being +compared or merged using operations such as @code{ediff-revision} or +@code{ediff-merge-revisions} are not deleted on exit. The normal action is +to clean up and delete these version files. + @item ediff-grab-mouse @vindex @code{ediff-grab-mouse} Default is @code{t}. Normally, Ediff grabs mouse and puts it in its @@ -2457,6 +2468,7 @@ (jaffe@@chipmunk.cita.utoronto.ca), David Karr (dkarr@@nmo.gtegsc.com), Norbert Kiesel (norbert@@i3.informatik.rwth-aachen.de), +Steffen Kilb (skilb@@gmx.net), Leigh L Klotz (klotz@@adoc.xerox.com), Fritz Knabe (Fritz.Knabe@@ecrc.de), Heinz Knutzen (hk@@informatik.uni-kiel.d400.de),