X-Git-Url: https://code.delx.au/gnu-emacs/blobdiff_plain/678e7c71c450a74711e90587e13a41eeb20e2bc8..27f70a64389dbf769cf75fb672a50ea313495e3f:/man/ediff.texi diff --git a/man/ediff.texi b/man/ediff.texi index a9a7e592af..7a4c929a0e 100644 --- a/man/ediff.texi +++ b/man/ediff.texi @@ -26,7 +26,7 @@ This file documents Ediff, a comprehensive visual interface to Unix diff and patch utilities. Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, - 2003, 2004, 2005 Free Software Foundation, Inc. +2003, 2004, 2005, 2006 Free Software Foundation, Inc. @quotation Permission is granted to copy, distribute and/or modify this document @@ -135,7 +135,7 @@ The architecture and the interface are, of course, drastically different. @chapter Major Entry Points When Ediff starts up, it displays a small control window, which accepts the -Ediff commands and two or three windows displaying the files to be compared +Ediff commands, and two or three windows displaying the files to be compared or merged. The control window can be in its own small frame or it can be part of a bigger frame that displays other buffers. In any case, it is important that the control window be active (i.e., be the one receiving the @@ -686,6 +686,16 @@ Even though such regions will be skipped over, you can still jump to any one of them by typing the region number and then `j'. Typing @kbd{##} again puts Ediff back in the original state. +@item #c +@kindex #c +@vindex ediff-ignore-case-option +@vindex ediff-ignore-case-option3 +@vindex ediff-ignore-case +Toggle case sensitivity in the diff program. All diffs are recomputed. +Case sensitivity is controlled by the variables +@code{ediff-ignore-case-option}, @code{ediff-ignore-case-option3}, +and @code{ediff-ignore-case}, which are explained elsewhere. + @item #h @itemx #f @kindex #f @@ -819,7 +829,7 @@ identical to its default setting, as originally decided by Ediff. For instance, if Ediff is merging according to the `combined' policy, then the merge region is skipped over if it is different from the combination of the regions in buffers A and B. (Warning: swapping buffers A and B will confuse -things in this respect). If the merge region is marked as `prefer-A' then +things in this respect.) If the merge region is marked as `prefer-A' then this region will be skipped if it differs from the current difference region in buffer A, etc. @@ -1445,7 +1455,7 @@ the control frame. To start Ediff with an iconified Control Panel, you should set this variable to @code{t} and @code{ediff-prefer-long-help-message} to @code{nil} (@pxref{Quick Help Customization}). This behavior is useful -only if icons are allowed to accept keybord input (which depend on the +only if icons are allowed to accept keyboard input (which depends on the window manager and other factors). @end table @@ -1584,6 +1594,29 @@ Ediff may take a long time to skip over them because it has to compute fine differences of all intermediate regions. This delay does not indicate any problem. +@vindex ediff-ignore-case-option +@vindex ediff-ignore-case-option3 +@vindex ediff-ignore-case +Finally, Ediff can be told to ignore the case of the letters. This behavior +can be toggled with @kbd{#c} and it is controlled with three variables: +@code{ediff-ignore-case-option}, @code{ediff-ignore-case-option3}, and +@code{ediff-ignore-case}. + +The variable @code{ediff-ignore-case-option} specifies the option to pass +to the diff program for comparing two files or buffers. For GNU +@code{diff}, this option is @code{"-i"}. The variable +@code{ediff-ignore-case-option3} specifies the option to pass to the +@code{diff3} program in order to make it case-insensitive. GNU @code{diff3} +does not have such an option, so when merging or comparing three files with +this program, ignoring the letter case is not supported. + +The variable @code{ediff-ignore-case} controls whether Ediff starts out by +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 @@ -1650,7 +1683,7 @@ Ediff uses faces to highlight differences. @item ediff-highlight-all-diffs @vindex ediff-highlight-all-diffs -Indicates whether---on a windowind display---Ediff should highlight +Indicates whether---on a windowing display---Ediff should highlight differences using inserted strings (as on text-only terminals) or using colors and highlighting. Normally, Ediff highlights all differences, but the selected difference is highlighted more visibly. One can cycle through @@ -1689,7 +1722,7 @@ some Lisp code in @file{~/.emacs}. For instance, @end example @noindent -would use the pre-defined fase @code{bold-italic} to highlight the current +would use the pre-defined face @code{bold-italic} to highlight the current difference region in buffer A (this face is not a good choice, by the way). If you are unhappy with just @emph{some} of the aspects of the default @@ -2286,6 +2319,14 @@ prior to starting Ediff, so Ediff just preserves status quo here. 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 @@ -2388,6 +2429,7 @@ Here is a hopefully full list of contributors: @example Adrian Aichner (aichner@@ecf.teradyne.com), +Drew Adams (drew.adams@@oracle.com), Steve Baur (steve@@xemacs.org), Neal Becker (neal@@ctd.comsat.com), E.@: Jay Berkenbilt (ejb@@ql.org), @@ -2416,6 +2458,7 @@ Aaron Gross (aaron@@bfr.co.il), Thorbjoern Hansen (thorbjoern.hansen@@mchp.siemens.de), Marcus Harnisch (marcus_harnisch@@mint-tech.com), Steven E. Harris (seh@@panix.com), +Aaron S. Hawley (Aaron.Hawley@@uvm.edu), Xiaoli Huang (hxl@@epic.com), Andreas Jaeger (aj@@suse.de), Lars Magne Ingebrigtsen (larsi@@ifi.uio.no), @@ -2425,6 +2468,7 @@ Karl Heuer (kwzh@@gnu.org), (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),