[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] Changes to emacs/man/ediff.texi,v
From: |
Michael Kifer |
Subject: |
[Emacs-diffs] Changes to emacs/man/ediff.texi,v |
Date: |
Sun, 18 Jun 2006 17:12:16 +0000 |
CVSROOT: /cvsroot/emacs
Module name: emacs
Changes by: Michael Kifer <kifer> 06/06/18 17:12:16
Index: ediff.texi
===================================================================
RCS file: /cvsroot/emacs/emacs/man/ediff.texi,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -b -r1.45 -r1.46
--- ediff.texi 5 Jun 2006 11:44:42 -0000 1.45
+++ ediff.texi 18 Jun 2006 17:12:16 -0000 1.46
@@ -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).
+
address@hidden ediff-keep-tmp-versions
address@hidden @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
address@hidden 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),
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] Changes to emacs/man/ediff.texi,v,
Michael Kifer <=