2006-02-19 Michael Kifer <[email protected]>

	* viper-cmd.el (viper-insert-state-post-command-sentinel,
	viper-change-state-to-vi, viper-change-state-to-emacs):
	made aware of cursor coloring in the emacs state.
	(viper-special-read-and-insert-char): use read-char-exclusive.
	(viper-minibuffer-trim-tail): workaround for fields in minibuffer.

	* viper-init.el (viper-emacs-state-cursor-color): new variable.

	* viper-util.el (viper-save-cursor-color,
	viper-get-saved-cursor-color-in-replace-mode,
	viper-get-saved-cursor-color-in-insert-mode,
	viper-restore-cursor-color): make aware of the cursor color in emacs
	state.
	(viper-get-saved-cursor-color-in-emacs-mode): new function.

	* ediff-diff.el (ediff-ignore-case, ediff-ignore-case-option,
	ediff-ignore-case-option3, ediff-actual-diff-options,
	ediff-actual-diff3-options): new variables to control case sensitivity.
	(ediff-make-diff2-buffer, ediff-setup-fine-diff-regions,
	ediff-setup-diff-regions3): made aware of case-sensitivity.
	(ediff-toggle-ignore-case): new function.
	(ediff-extract-diffs, ediff-extract-diffs3): preserve point in buffers.

	* ediff-help.el (ediff-long-help-message-narrow2,
	ediff-long-help-message-compare2, ediff-long-help-message-compare3,
	ediff-long-help-message-word-mode): add ignore-case command.
	(ediff-help-for-quick-help): add ignore-case command.

	* ediff-merg.el: move provide to the end.

	* ediff-ptch.el: move provide to the end.

	* ediff-wind.el: move provide to the end.

	* ediff-mult.el: move provide to the end.
	(ediff-set-meta-overlay): enable follow-link.

	* ediff.el: move provide to the end.
	Break recursive load cycle in eval-when-compile.
	(ediff-patch-buffer): better heuristics.

	* ediff-util.el: move provide to the end.
	Break recursive load cycle in eval-when-compile.
	(ediff-setup-keymap): add binding for #c. Replaced some defsubsts with
	defuns.
	(ediff-submit-report): pass the values of ediff-diff3-program,
	ediff-diff3-options.

2 files changed, 37 insertions, 0 deletions

diff --git a/man/ediff.texi b/man/ediff.texi
index 67e822049c..01e79c821d 100644
--- a/man/ediff.texi
+++ b/man/ediff.texi
@@ -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
@@ -1584,6 +1594,28 @@ 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:
+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}.
+
+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}.
+
 @node Highlighting Difference Regions, Narrowing, Selective Browsing, Customization
 @section Highlighting Difference Regions
 
@@ -2388,6 +2420,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),
diff --git a/man/viper.texi b/man/viper.texi
index 4ad437a762..46d6267034 100644
--- a/man/viper.texi
+++ b/man/viper.texi
@@ -1870,6 +1870,10 @@ application.
 @vindex @code{viper-insert-state-cursor-color}
 If set to a valid color, this will be the cursor color when Viper is in
 insert state.
+@item viper-emacs-state-cursor-color nil
+@vindex @code{viper-emacs-state-cursor-color}
+If set to a valid color, this will be the cursor color when Viper is in
+emacs state.
 @item viper-replace-region-end-delimiter "$"
 A string used to mark the end of replacement regions.  It is used only on
 TTYs or if @code{viper-use-replace-region-delimiters} is non-@code{nil}.