Received: (at submit) by debbugs.gnu.org; 17 Nov 2010 20:35:36 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Wed Nov 17 15:35:36 2010
Received: from localhost ([127.0.0.1] helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.69)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1PIoiz-0004lc-Vf
for submit <at> debbugs.gnu.org; Wed, 17 Nov 2010 15:35:36 -0500
Received: from eggs.gnu.org ([140.186.70.92])
by debbugs.gnu.org with esmtp (Exim 4.69)
(envelope-from <tehom@HIDDEN>) id 1PIoiy-0004lV-15
for submit <at> debbugs.gnu.org; Wed, 17 Nov 2010 15:35:24 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
(envelope-from <tehom@HIDDEN>) id 1PIonq-0006ke-7A
for submit <at> debbugs.gnu.org; Wed, 17 Nov 2010 15:40:27 -0500
X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on eggs.gnu.org
X-Spam-Level:
X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_NONE,
T_RP_MATCHES_RCVD autolearn=unavailable version=3.3.1
Received: from lists.gnu.org ([199.232.76.165]:38184)
by eggs.gnu.org with esmtp (Exim 4.71)
(envelope-from <tehom@HIDDEN>) id 1PIonq-0006ka-4S
for submit <at> debbugs.gnu.org; Wed, 17 Nov 2010 15:40:26 -0500
Received: from [140.186.70.92] (port=38993 helo=eggs.gnu.org)
by lists.gnu.org with esmtp (Exim 4.43) id 1PIonp-0003aQ-6t
for bug-gnu-emacs@HIDDEN; Wed, 17 Nov 2010 15:40:26 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
(envelope-from <tehom@HIDDEN>) id 1PIonn-0006kN-WC
for bug-gnu-emacs@HIDDEN; Wed, 17 Nov 2010 15:40:25 -0500
Received: from mail2.panix.com ([166.84.1.73]:53873)
by eggs.gnu.org with esmtp (Exim 4.71)
(envelope-from <tehom@HIDDEN>) id 1PIonn-0006kH-QN
for bug-gnu-emacs@HIDDEN; Wed, 17 Nov 2010 15:40:23 -0500
Received: from mailbackend.panix.com (mailbackend.panix.com [166.84.1.89])
by mail2.panix.com (Postfix) with ESMTP id AF95138E4B
for <bug-gnu-emacs@HIDDEN>; Wed, 17 Nov 2010 15:40:23 -0500 (EST)
Received: from mail.panix.com (localhost [127.0.0.1])
by mailbackend.panix.com (Postfix) with ESMTP id 94035322E2
for <bug-gnu-emacs@HIDDEN>; Wed, 17 Nov 2010 15:40:23 -0500 (EST)
X-Panix-Received: from 96.252.49.112
(SquirrelMail authenticated user tehom@HIDDEN)
by mail.panix.com with HTTP; Wed, 17 Nov 2010 15:40:23 -0500
Message-ID: <fd02b175b3c089d81d39553474ad66bf.squirrel@HIDDEN>
Date: Wed, 17 Nov 2010 15:40:23 -0500
Subject: Bug in ediff's treatment of whitespace (this time with ALL the
attachments)
From: "Tom Breton (Tehom)" <tehom@HIDDEN>
To: bug-gnu-emacs@HIDDEN
User-Agent: SquirrelMail/1.4.19
MIME-Version: 1.0
Content-Type: multipart/mixed;boundary="----=_20101117154023_38812"
X-Priority: 3 (Normal)
Importance: Normal
X-detected-operating-system: by eggs.gnu.org: Genre and OS details not
recognized.
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
X-Spam-Score: -5.9 (-----)
X-Debbugs-Envelope-To: submit
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.11
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <http://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <http://debbugs.gnu.org/pipermail/debbugs-submit>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <http://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Sender: debbugs-submit-bounces <at> debbugs.gnu.org
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
X-Spam-Score: -3.9 (---)
------=_20101117154023_38812
Content-Type: text/plain; charset="iso-8859-1"
Content-Transfer-Encoding: quoted-printable
**** Explanation of the bug:
Wordwise merging in ediff doesn't handle whitespace reasonably when
merging to a blank element. It just plops the non-blank element at the
end of whatever whitespace it ends up with, even across line breaks.
**** How it should work (IMO)
IMO it would be more correct to infer the division of whitespace from the
whitespace around the non-blank element.
**** Instructions for reproducing it
***** General orientation
Use the attached files:
* odd-whitespace-2-file1.{abc}.txt
* odd-whitespace-file1.{abc}.txt
I found it useful to give each set of {a,b,c} its own directory and keep
the filenames the same across directories. I can't attach them to this
email with directory names, though.
I found this code useful in seeing this bug, so I'm including it here. I=
t
just starts an merge-with-ancestor with the respective files - saves time=
.
It expects filenames of the form file1.{a,b,c}.txt in different
directories.
(defun bug-ediff-merge-files-with-ancestor (dir)
""
(interactive "DDirectory: ")
(ediff-merge-files-with-ancestor
(expand-file-name "file1.a.txt" dir)
(expand-file-name "file1.b.txt" dir)
(expand-file-name "file1.c.txt" dir)))
***** Explicit instructions
* Merge file1.a.txt with file1.b.txt using ancestor file1.c.txt
* "n" to go to first clash
* "b" to partly merge - just so it's merging nicely and not seeing
"<<<<<<" ">>>>>>" "#####Ancestor" etc
* "=3D" to start an inferior merge
* "a" to compare to buffer A
* (Now in the inferior ediff)
* "n" to go to a line that still needs to be merged to the ancestor.
In the demo they're all of the form "Line N A".
* "a" to try to use the version from A.
* It doesn't merge right. It moves "A" to another place.
Both odd-whitespace-* and odd-whitespace-2-* exhibit similar unexpected
behavior.
Tom Breton (Tehom)
------=_20101117154023_38812
Content-Type: text/plain; name="odd-whitespace-file1.a.txt"
Content-Disposition: attachment; filename="odd-whitespace-file1.a.txt"
Content-Transfer-Encoding: quoted-printable
Line 1
Line 2
Line 3 A
Line 4
Line 5 A
Line 6
Line 7 A
Line 8
Line 9
Line 10
------=_20101117154023_38812
Content-Type: text/plain; name="odd-whitespace-file1.b.txt"
Content-Disposition: attachment; filename="odd-whitespace-file1.b.txt"
Content-Transfer-Encoding: quoted-printable
Line 1
Line 2
Line 3
Line 4 B
Line 5
Line 6 B
Line 7
Line 8 B
Line 9
Line 10
------=_20101117154023_38812
Content-Type: text/plain; name="odd-whitespace-file1.c.txt"
Content-Disposition: attachment; filename="odd-whitespace-file1.c.txt"
Content-Transfer-Encoding: quoted-printable
Line 1
Line 2
Line 3
Line 4
Line 5
Line 6
Line 7
Line 8
Line 9
Line 10
------=_20101117154023_38812
Content-Type: text/plain; name="odd-whitespace-2-file1.a.txt"
Content-Disposition: attachment; filename="odd-whitespace-2-file1.a.txt"
Content-Transfer-Encoding: quoted-printable
Line 1 X
Line 2 X
Line 3 A X
Line 4 X
Line 5 A X
Line 6 X
Line 7 A X
Line 8 X
Line 9 X
Line 10 X
------=_20101117154023_38812
Content-Type: text/plain; name="odd-whitespace-2-file1.b.txt"
Content-Disposition: attachment; filename="odd-whitespace-2-file1.b.txt"
Content-Transfer-Encoding: quoted-printable
Line 1 X
Line 2 X
Line 3 X
Line 4 B X
Line 5 X
Line 6 B X
Line 7 X
Line 8 B X
Line 9 X
Line 10 X
------=_20101117154023_38812
Content-Type: text/plain; name="odd-whitespace-2-file1.c.txt"
Content-Disposition: attachment; filename="odd-whitespace-2-file1.c.txt"
Content-Transfer-Encoding: quoted-printable
Line 1 X
Line 2 X
Line 3 X
Line 4 X
Line 5 X
Line 6 X
Line 7 X
Line 8 X
Line 9 X
Line 10 X
------=_20101117154023_38812--
"Tom Breton (Tehom)" <tehom@HIDDEN>:bug-gnu-emacs@HIDDEN.
Full text available.owner <at> debbugs.gnu.org, bug-gnu-emacs@HIDDEN:bug#7430; Package emacs.
Full text available.
GNU bug tracking system
Copyright (C) 1999 Darren O. Benham,
1997 nCipher Corporation Ltd,
1994-97 Ian Jackson.