[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
ediff-diff-options is ignored
From: |
Jesper Harder |
Subject: |
ediff-diff-options is ignored |
Date: |
Tue, 06 Jun 2006 16:57:16 +0200 |
User-agent: |
Gnus/5.110004 (No Gnus v0.4) Emacs/22.0.50 (darwin) |
Hi,
Ediff ignores the `ediff-diff-options' option. The background is that
I need to compare utf-16 files, which diff consider binary unless you
pass a "--text" option.
Steps to reproduce:
* Customize `ediff-diff-options' to "--text"
* Create two text files, save as utf-16
* `M-x ediff-files' on the two files.
* Result: The *ediff-errors* buffer contains this message:
Binary files /Users/harder/a.txt and /Users/harder/b.txt differ
which means that the "--text" option wasn't passed to diff.
It works correctly in Emacs 21.4; and the regression appears to have
been introduced by this change:
2006-02-19 Michael Kifer <address@hidden>
* 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): Make aware of case-sensitivity.
(ediff-toggle-ignore-case): New function.
(ediff-extract-diffs, ediff-extract-diffs3): Preserve point in buffers.
In GNU Emacs 22.0.50.12 (powerpc-apple-darwin8.6.0)
of 2006-06-06 on Jesper-Harders-Computer.local
X server distributor `Apple Computers', version 10.4.6
configured using `configure '--enable-carbon-app' '--without-x'
'CFLAGS=-DUSE_ATSUI''
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- ediff-diff-options is ignored,
Jesper Harder <=