Mailing-List:	contact cygwin-help AT sourceware DOT cygnus DOT com; run by ezmlm
List-Subscribe:	<mailto:cygwin-subscribe AT sources DOT redhat DOT com>
List-Archive:	<http://sources.redhat.com/ml/cygwin/>
List-Post:	<mailto:cygwin AT sources DOT redhat DOT com>
List-Help:	<mailto:cygwin-help AT sources DOT redhat DOT com>, <http://sources.redhat.com/ml/#faqs>
Sender:	cygwin-owner AT sources DOT redhat DOT com
Delivered-To:	mailing list cygwin AT sources DOT redhat DOT com
To:	Stephen Leake <stephen DOT a DOT leake DOT 1 AT gsfc DOT nasa DOT gov>
Cc:	Chuck DOT Irvine AT mail DOT sprint DOT com, cygwin AT sourceware DOT cygnus DOT com,
	ntemacs-users AT cs DOT washington DOT edu
Subject:	Re: ediff falsely identifying a difference as white space only
References:	<H00009db076a2b34 DOT 0975522121 DOT kcopmp06 AT MHS> <u66l6xwpo DOT fsf AT gsfc DOT nasa DOT gov>
Cc:	Karel Sprenger <cjas AT xs4all DOT nl>
X-Public-Key:	http://pgp5.ai.mit.edu:11371/pks/lookup?op=get&search=0xA4846394
From:	Karel Sprenger <cjas AT xs4all DOT nl>
Date:	30 Nov 2000 00:10:35 +0100
In-Reply-To:	Stephen Leake's message of "29 Nov 2000 17:03:15 -0500"
Message-ID:	<u8zq2idck.fsf@xs4all.nl>
Lines:	40
User-Agent:	Gnus/5.0803 (Gnus v5.8.3) Emacs/20.7
MIME-Version:	1.0

Hi,

>>> On 29 Nov 2000 17:03:15 -0500, Stephen Leake (Stephen) wrote:
Stephen> 
Stephen> Chuck DOT Irvine AT mail DOT sprint DOT com writes:
>> I'm trying to use vc-resolve-conflicts using ntemacs (20.7.1) and Cygwin
>> (1.1.x). First I had to download the newestest version of ediff because
>> the one that ships with ntemacs expects a version of diff(3) that
>> accepts the -binary flag. Diff that comes with Cygwin doesn't accept
>> this arg. After I installed ediff, I tried to invoke
>> vc-resolve-conflicts on the attached file (A.java). The ediff windows
>> came up as expected, highlighting a single conflict. The problem is that
>> when I moved to this conflict, ediff outputs in the mode line "Only
>> white-space differences in region 1 in buffers A & B" which, if you
>> look, isn't the case.
Stephen> 
Stephen> Works nicely for me in Emacs 20.6.1, cygwin 1.1.4.
Stephen> 
>> I suspect that the problem might have something to do with those
>> cursed "^M"s - I don't know. I suspect this because when I look into
>> the *ediff-fine-diff* buffer, I see:
Stephen> 
Stephen> I don't see ^Ms in my buffer; it's using DOS coding system. Maybe you
Stephen> need to adjust some coding system setting. On the other hand, maybe
Stephen> they just didn't survive being MIME'd.
Stephen> 

Same here.  No problems with NTemacs 20.7.1 and cygwin 1.1.6.  I have set
ediff-diff-options to "-b", though.  And cygwin's diff does accept the
--binary flag (that's two minus signs).  Hope this helps.

Cheers,
Karel

--
Karel Sprenger, senior solution specialist
COMPAQ, Professional Services
Mobile: +31 (6) 5178 5034           Home: +31 (20) 670 0942
E-mail: karel DOT sprenger AT compaq DOT com   Private: cjas AT xs4all DOT nl
"The best way to have a good idea is to have lots of ideas." - Linus Pauling


--
Want to unsubscribe from this list?
Send a message to cygwin-unsubscribe AT sourceware DOT cygnus DOT com

- Raw text -