Hi Mike, I like the new #c (ignore case) feature of ediff a lot!
It works just like I wanted.
It has some difficulty, however, with my setting of
ediff-diff-options "--binary --strip-trailing-cr"
which it moans about in the following way:
Options `-c' and `-i' are not allowed in `ediff-diff-options'
Here is my suggested medical treatment (one application should
suffice):
2006-02-20 Adrian Aichner <adrian(a)xemacs.org>
* ediff-diff.el (ediff-setup-diff-regions): Avoid false positives
of forbidden options by adding leading context of space or begin
of string.
--- c:\Program Files\XEmacs\xemacs-packages\lisp\ediff\ediff-diff.el~ 2006-02-20
20:44:35.000000000 +0100
+++ c:\Program Files\XEmacs\xemacs-packages\lisp\ediff\ediff-diff.el 2006-02-20
21:29:09.765625000 +0100
@@ -251,7 +251,7 @@
;; ediff-setup-diff-regions3, which takes 4 arguments.
(defun ediff-setup-diff-regions (file-A file-B file-C)
;; looking for '-c', '-i', or a 'c', 'i' among
clustered non-long options
- (if (string-match "^-[ci]\\| -[ci]\\|-[^- ]+[ci]" ediff-diff-options)
+ (if (string-match "^-[ci]\\| -[ci]\\|\\(^\\| \\)-[^- ]+[ci]"
ediff-diff-options)
(error "Options `-c' and `-i' are not allowed in
`ediff-diff-options'"))
;; create, if it doesn't exist
Best regards,
Adrian
Emacs: XEmacs 21.5 (beta24) "dandelion" (+CVS-20051218) [Lucid] (i586-pc-win32,
Mule) of Mon Dec 19 2005 on TANG
Package: Ediff 2.81 of February 18, 2006
current state:
==============
(setq
ediff-diff-program "diff"
ediff-diff-options "--binary --strip-trailing-cr"
ediff-diff3-program "diff3"
ediff-diff3-options ""
ediff-shell "cmd.exe"
ediff-use-faces t
ediff-auto-refine 'on
ediff-highlighting-style 'face
ediff-buffer-A #<buffer "ediff-diff.el~">
ediff-buffer-B #<buffer "ediff-diff.el">
ediff-control-buffer #<buffer "*Ediff Control Panel<13>*">
ediff-forward-word-function 'ediff-forward-word
ediff-control-frame nil
ediff-control-frame-parameters '((name . "Ediff") (minibuffer)
(user-position . t) (vertical-scroll-bars)
(scrollbar-width . 0) (scrollbar-height . 0)
(menu-bar-lines . 0) (tool-bar-lines . 0)
(auto-lower) (auto-raise . t) (visibility)
(width . 1) (height . 1) (top . 1051)
(left . 1401))
ediff-control-frame-position-function 'ediff-make-frame-position
ediff-prefer-iconified-control-frame nil
ediff-window-setup-function 'ediff-setup-windows-plain
ediff-split-window-function 'split-window-vertically
ediff-job-name 'ediff-files
ediff-word-mode nil
buffer-name "*Ediff Control Panel<13>*"
ediff-device-type 'mswindows
)
--
Adrian Aichner
mailto:adrian@xemacs.org
http://www.xemacs.org/