[Emacs-diffs] Changes to emacs/man/ediff.texi

[Michael Kifer]

Index: emacs/man/ediff.texi
diff -u emacs/man/ediff.texi:1.41 emacs/man/ediff.texi:1.42
--- emacs/man/ediff.texi:1.41   Sun Feb  5 22:41:30 2006
+++ emacs/man/ediff.texi        Sun Feb 19 03:16:44 2006
@@ -686,6 +686,16 @@
 one of them by typing the region number and then `j'.  Typing @kbd{##}
 again puts Ediff back in the original state.
 
address@hidden #c
address@hidden #c
address@hidden ediff-ignore-case-option
address@hidden ediff-ignore-case-option3
address@hidden ediff-ignore-case
+Toggle case sensitivity in the diff program. All diffs are recomputed.
+Case sensitivity is controlled by the variables
address@hidden, @code{ediff-ignore-case-option3},
+and @code{ediff-ignore-case}, which are explained elsewhere.
+
 @item #h
 @itemx #f
 @kindex #f
@@ -1584,6 +1594,28 @@
 differences of all intermediate regions.  This delay does not indicate any
 problem.
 
address@hidden ediff-ignore-case-option
address@hidden ediff-ignore-case-option3
address@hidden 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:
+Toggle case sensitivity in the diff program. All diffs are recomputed.
+Case sensitivity is controlled by the variables
address@hidden, @code{ediff-ignore-case-option3}, and
address@hidden
+
+The variable @code{ediff-ignore-case-option} specifies the option to pass
+to the diff program for comparing two files or buffers. For GNU
address@hidden, this option is @code{"-i"}. The variable
address@hidden specifies the option to pass to the
address@hidden 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
address@hidden
+
 @node Highlighting Difference Regions, Narrowing, Selective Browsing, 
Customization
 @section Highlighting Difference Regions
 
@@ -2388,6 +2420,7 @@
 
 @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),