From: Reiner Steib <reiner.steib@gmx.de>
To: Eli Zaretskii <eliz@gnu.org>
Cc: 4451@emacsbugs.donarmstrong.com
Subject: bug#4451: 23.1; EOL problems with vc-diff and cygwin
Date: Thu, 17 Sep 2009 16:26:12 +0200 [thread overview]
Message-ID: <20090917162612.l0stf7ln28gc4s8o@imap.uni-ulm.de> (raw)
In-Reply-To: <83r5u6wqvs.fsf@gnu.org>
Eli Zaretskii <eliz@gnu.org> wrote:
>> From: Reiner Steib <reinersteib+gmane@imap.cc>
>>
>> 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 =' (`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
you mean the "cvs diff" output. The output of "cvs diff" in cygwin's
bash has DOS line endings, no duplicate "^M", see below.
The saved Emacs buffer from vc-diff (vc-diff-2.output) has "^M^M$"
whereas the buffer from cvs-mode-diff (cvs-mode-diff.output) has
"^M$". I checked the original files now, to avoid some mail transfer
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$
===================================================================^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$
<?aaa aaaaaaa='1.1'^I^M$
aaaaaaaa='AAA-1'^I^M$
?>^I^M$
-<aaaaaa aaaa='AA1'^I^M$
+<aaaaaa aaaa='AA1_aaaa_aaa11111'^I^M$
aaaaaaa='1.1.1'^I^M$
aaaaaa-aaaaaaa='1.1.1'^I^M$
aaaaa='aaaa'^I^M$
@@ -1111,1 +1111,11 @@^M$
aaaaaAaaa='11/1111'^I^M$
aaAaaaaAaaaaaaaaa='Aa'^I^M$
aaAaaaaaaaAaaaaaaaaa='Aa'^I^M$
+ />^I^M$
+<aaaaaaaaAaaaaaAaaa aaaaa='aaaa://aaa.aaa.aaa/aaa/AaaaAaaaa/AAA'^I^M$
+ aaaaaAA='1111111'^I^M$
+ Aaaaaaa='aaaa'^I^M$
+ aaAaaaaa='Aaaaaa'^I^M$
+ aaaaaAaaa='AAAA_Aaaaaa_AaaaAaaaaa'^I^M$
+ aaaaaaaa='aaaaaa'^I^M$
+ aaaaaaaa='aaaa'^I^M$
+ aaaaa='aaaaa'^I^M$
+ aaaaaaaaAaaa=''^I^M$
+ aaa='AAA 11.111'^I^M$
+ aaaaaAaaa='1/1111'^I^M$
+ aaAaaaaAaaaaaaaaa='Aa'^I^M$
+ aaAaaaaaaaAaaaaaaaaa='Aaa'^I^M$
/></AaaaaaaaAaaaaaAaaaaaa>^M$
<AaaaAaaaaaa aaaaa='aaaa://aaa.aaa.aaa/aaa/AaaaAaaaa/AAA'^I^M$
>^I^M$
next prev parent reply other threads:[~2009-09-17 14:26 UTC|newest]
Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-09-16 18:08 bug#4451: 23.1; EOL problems with vc-diff and cygwin Reiner Steib
2009-09-16 20:56 ` Eli Zaretskii
2009-09-17 14:26 ` Reiner Steib [this message]
2009-09-17 16:35 ` Stefan Monnier
2009-09-17 17:22 ` Eli Zaretskii
2009-09-17 20:59 ` Stefan Monnier
2009-09-18 11:29 ` Reiner Steib
2009-09-24 17:00 ` Reiner Steib
2009-09-24 22:07 ` Stefan Monnier
2009-09-25 19:11 ` Eli Zaretskii
2009-09-26 8:27 ` Reiner Steib
2009-09-26 9:20 ` Eli Zaretskii
2009-09-27 0:36 ` Stefan Monnier
2009-09-27 7:38 ` Eli Zaretskii
2009-09-27 19:03 ` Stefan Monnier
2009-09-27 20:35 ` Reiner Steib
2009-09-28 1:08 ` Stefan Monnier
2009-10-05 16:07 ` Reiner Steib
2009-10-05 18:45 ` Stefan Monnier
2009-10-05 20:58 ` Eli Zaretskii
2010-07-15 7:22 ` Reiner Steib
2010-07-15 8:33 ` Eli Zaretskii
2010-07-16 6:51 ` Reiner Steib
2010-07-16 8:05 ` Andreas Schwab
2010-07-16 10:18 ` Eli Zaretskii
2010-07-19 7:23 ` Reiner Steib
2009-09-17 17:18 ` Eli Zaretskii
2009-09-18 11:31 ` Reiner Steib
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20090917162612.l0stf7ln28gc4s8o@imap.uni-ulm.de \
--to=reiner.steib@gmx.de \
--cc=4451@emacsbugs.donarmstrong.com \
--cc=eliz@gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this external index
https://git.savannah.gnu.org/cgit/emacs.git
https://git.savannah.gnu.org/cgit/emacs/org-mode.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.