diff man/ediff.texi @ 83531:a387c138b28e

Merged from [e-mail] Patches applied: * [e-mail]/emacs--devo--0--patch-305 Update from CVS * [e-mail]/emacs--devo--0--patch-306 Update from CVS * [e-mail]/emacs--devo--0--patch-307 Update from CVS: lispref/display.texi (Forcing Redisplay): Fix typo. * [e-mail]/emacs--devo--0--patch-308 Update from CVS * [e-mail]/emacs--devo--0--patch-309 Update from CVS * [e-mail]/emacs--devo--0--patch-310 Update from CVS * [e-mail]/emacs--devo--0--patch-311 Update from CVS * [e-mail]/emacs--devo--0--patch-312 Update from CVS * [e-mail]/emacs--devo--0--patch-313 Merge from gnus--rel--5.10 * [e-mail]/emacs--devo--0--patch-314 Update from CVS * [e-mail]/emacs--devo--0--patch-315 Update from CVS * [e-mail]/emacs--devo--0--patch-316 Update from CVS * [e-mail]/emacs--devo--0--patch-317 Merge from gnus--rel--5.10 * [e-mail]/emacs--devo--0--patch-318 Update from CVS * [e-mail]/emacs--devo--0--patch-319 Update from CVS * [e-mail]/emacs--devo--0--patch-320 Update from CVS * [e-mail]/emacs--devo--0--patch-321 Merge from gnus--rel--5.10 * [e-mail]/emacs--devo--0--patch-322 Update from CVS * [e-mail]/emacs--devo--0--patch-323 lisp/play/cookie1.el (cookie): Work properly when there's only one entry * [e-mail]/emacs--devo--0--patch-324 Update from CVS * [e-mail]/emacs--devo--0--patch-325 Update from CVS * [e-mail]/emacs--devo--0--patch-326 Update from CVS * [e-mail]/emacs--devo--0--patch-327 Update from CVS * [e-mail]/emacs--devo--0--patch-328 Update from CVS * [e-mail]/emacs--devo--0--patch-329 Update from CVS * [e-mail]/emacs--devo--0--patch-330 Update from CVS * [e-mail]/gnus--rel--5.10--patch-105 Update from CVS * [e-mail]/gnus--rel--5.10--patch-106 Update from CVS * [e-mail]/gnus--rel--5.10--patch-107 Update from CVS * [e-mail]/gnus--rel--5.10--patch-108 Merge from emacs--devo--0 * [e-mail]/gnus--rel--5.10--patch-109 Clean up merge mistakes * [e-mail]/gnus--rel--5.10--patch-110 Update from CVS git-archimport-id: [e-mail]--2004/emacs--multi-tty--0--patch-571

--- a/man/ediff.texi	Mon Jun 12 07:27:12 2006 +0000
+++ b/man/ediff.texi	Tue Jun 27 15:06:36 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),