From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Reiner Steib Newsgroups: gmane.emacs.bugs Subject: bug#4451: 23.1; EOL problems with vc-diff and cygwin Date: Thu, 17 Sep 2009 16:26:12 +0200 Message-ID: <20090917162612.l0stf7ln28gc4s8o@imap.uni-ulm.de> References: <87skemzrre.fsf@marauder.physik.uni-ulm.de> <83r5u6wqvs.fsf@gnu.org> Reply-To: Reiner Steib , 4451@emacsbugs.donarmstrong.com NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1; DelSp="Yes"; format="flowed" Content-Transfer-Encoding: quoted-printable X-Trace: ger.gmane.org 1253198850 6430 80.91.229.12 (17 Sep 2009 14:47:30 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Thu, 17 Sep 2009 14:47:30 +0000 (UTC) Cc: 4451@emacsbugs.donarmstrong.com To: Eli Zaretskii Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Thu Sep 17 16:47:23 2009 Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane.org Original-Received: from lists.gnu.org ([199.232.76.165]) by lo.gmane.org with esmtp (Exim 4.50) id 1MoIGX-0004Rp-8H for geb-bug-gnu-emacs@m.gmane.org; Thu, 17 Sep 2009 16:47:22 +0200 Original-Received: from localhost ([127.0.0.1]:54623 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1MoIGW-0002o5-Im for geb-bug-gnu-emacs@m.gmane.org; Thu, 17 Sep 2009 10:47:20 -0400 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1MoIGS-0002n6-6b for bug-gnu-emacs@gnu.org; Thu, 17 Sep 2009 10:47:16 -0400 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1MoIGN-0002lH-JQ for bug-gnu-emacs@gnu.org; Thu, 17 Sep 2009 10:47:15 -0400 Original-Received: from [199.232.76.173] (port=34167 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1MoIGN-0002lD-GA for bug-gnu-emacs@gnu.org; Thu, 17 Sep 2009 10:47:11 -0400 Original-Received: from mx20.gnu.org ([199.232.41.8]:58363) by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.60) (envelope-from ) id 1MoIGN-0005jh-17 for bug-gnu-emacs@gnu.org; Thu, 17 Sep 2009 10:47:11 -0400 Original-Received: from rzlab.ucr.edu ([138.23.92.77]) by mx20.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1MoIGM-0008HO-5A for bug-gnu-emacs@gnu.org; Thu, 17 Sep 2009 10:47:10 -0400 Original-Received: from rzlab.ucr.edu (rzlab.ucr.edu [127.0.0.1]) by rzlab.ucr.edu (8.14.3/8.14.3/Debian-5) with ESMTP id n8HEl13f000333; Thu, 17 Sep 2009 07:47:01 -0700 Original-Received: (from debbugs@localhost) by rzlab.ucr.edu (8.14.3/8.14.3/Submit) id n8HEZ4aW030792; Thu, 17 Sep 2009 07:35:04 -0700 Resent-Date: Thu, 17 Sep 2009 07:35:04 -0700 X-Loop: owner@emacsbugs.donarmstrong.com Resent-From: Reiner Steib Resent-To: bug-submit-list@donarmstrong.com Resent-CC: Emacs Bugs 2Resent-Date: Thu, 17 Sep 2009 14:35:04 +0000 Resent-Message-ID: Resent-Sender: owner@emacsbugs.donarmstrong.com X-Emacs-PR-Message: followup 4451 X-Emacs-PR-Package: emacs X-Emacs-PR-Keywords: Original-Received: via spool by 4451-submit@emacsbugs.donarmstrong.com id=B4451.125319757629610 (code B ref 4451); Thu, 17 Sep 2009 14:35:04 +0000 Original-Received: (at 4451) by emacsbugs.donarmstrong.com; 17 Sep 2009 14:26:16 +0000 X-Spam-Bayes: score:0.5 Bayes not run. spammytokens:Tokens not available. hammytokens:Tokens not available. Original-Received: from mail.uni-ulm.de (mail.uni-ulm.de [134.60.1.11]) by rzlab.ucr.edu (8.14.3/8.14.3/Debian-5) with ESMTP id n8HEQDYL029607 for <4451@emacsbugs.donarmstrong.com>; Thu, 17 Sep 2009 07:26:15 -0700 Original-Received: from poseidon.rz.uni-ulm.de (localhost [127.0.0.1]) by smtp.uni-ulm.de (8.14.2/8.14.2) with ESMTP id n8HEQCWb019198; Thu, 17 Sep 2009 16:26:12 +0200 (MEST) Original-Received: (from cyrus@localhost) by poseidon.rz.uni-ulm.de (8.14.2/8.14.2/Submit) id n8HEQCc0019197; Thu, 17 Sep 2009 16:26:12 +0200 (MEST) Original-Received: from gate-6.ruv.de (gate-6.ruv.de [195.145.180.106]) by imap.uni-ulm.de (Horde MIME library) with HTTP; Thu, 17 Sep 2009 16:26:12 +0200 In-Reply-To: <83r5u6wqvs.fsf@gnu.org> Content-Disposition: inline User-Agent: Internet Messaging Program (IMP) H3 (4.1.5) X-Virus-Scanned: by amavisd-new X-detected-operating-system: by mx20.gnu.org: GNU/Linux 2.6 (newer, 2) X-detected-operating-system: by monty-python.gnu.org: GNU/Linux 2.6, seldom 2.4 (older, 4) Resent-Date: Thu, 17 Sep 2009 10:47:15 -0400 X-BeenThere: bug-gnu-emacs@gnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "Bug reports for GNU Emacs, the Swiss army knife of text editors" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Original-Sender: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Errors-To: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.bugs:31166 Archived-At: Eli Zaretskii wrote: >> From: Reiner Steib >> >> on Windows (with diff.exe from cygwin), I get annoying `^M' characters >> in the diff output (see attached file vc-diff-2.output) when using >> `C-x v =3D' (`vc-diff') on a file with Unix-style EOL. > > If you diff the same two files from the shell prompt using the same > diff.exe, what kind of EOLs do you get in the output? Is the result > similar to what you see in vc-diff? I don't diff two files, but I use CVS on a single file. So I guess =20 you mean the "cvs diff" output. The output of "cvs diff" in cygwin's =20 bash has DOS line endings, no duplicate "^M", see below. The saved Emacs buffer from vc-diff (vc-diff-2.output) has "^M^M$" =20 whereas the buffer from cvs-mode-diff (cvs-mode-diff.output) has =20 "^M$". I checked the original files now, to avoid some mail transfer =20 mangling. Bye, Reiner $ cvs diff K3.xml > /tmp/cygwin-cvs-diff.output $ file /tmp/cygwin-cvs-diff.output /tmp/cygwin-cvs-diff.output: RCS/CVS diff output text $ tac /tmp/cygwin-cvs-diff.output | file - /dev/stdin: ASCII text, with CRLF line terminators $ cvs diff SK3.xml | cat --show-all Aaaaa: AA1.aaa^M$ =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D^M$ AAA aaaa: A:\a\A\Aa\A/A/A/A/Aa/K3.xml,v^M$ aaaaaaaaaa aaaaaaaa 1.1^M$ aaaa -a -a1.1 AA1.aaa^M$ --- K3.xml^I11 Aaa 1111 11:11:11 -1111^I1.1^M$ +++ K3.xml^I11 Aaa 1111 11:11:11 -1111^M$ @@ -1,1 +1,1 @@^M$ ^I^M$ -^I^M$ +^M$ ^I^M$