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: Fri, 18 Sep 2009 13:31:45 +0200 [thread overview]
Message-ID: <20090918133145.24v7djonh4wowgc4@imap.uni-ulm.de> (raw)
In-Reply-To: <83ljkdwkug.fsf@gnu.org>
Eli Zaretskii <eliz@gnu.org> wrote:
> So does it help to add --binary to the diff switches? (Sorry, I have
> no idea how to do that with vc-diff, I just hope there is a way.)
There is:
| vc-cvs-diff-switches is a variable defined in `vc-cvs.el'.
| Its value is "-u"
Adding "--binary" results in completely unusable result:
| Index: K3.xml^M
| ===================================================================^M
| RCS file: [...]/K3.xml,v^M
| retrieving revision 1.2^M
| diff -u --binary -u -r1.2 K3.xml^M
| cvs.exe diff: warning: did not set stdout to binary mode^M
| --- K3.xml 24 Jul 2009 16:09:12 -0000 1.2^M
| +++ K3.xml 16 Sep 2009 11:20:27 -0000^M
| @@ -1,4365 +1,4379 @@^M
| -<?xml version='1.0' ^M^M
| - encoding='UTF-8' ^M^M
| -?> ^M^M
| -<policy name='K3' ^M^M
| - version='2.0.0' ^M^M
| - schema-version='1.0.0' ^M^M
| [... complete file follows ...]
| -</bar>^M^M
| -</foo>^M^M
| +<?xml version='1.0' ^M
| + encoding='UTF-8' ^M
| +?> ^M
| +<policy name='K3_test' ^M
| + version='2.0.0' ^M
| + schema-version='1.0.0' ^M
| [... complete file follows ...]
>> 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$".
>
> What is the value of buffer-file-coding-system in both of these
> buffers?
vc-diff / buffer *vc-diff*: iso-latin-1-dos
(saving this buffer and using `find-file-literally' display "^M^M$".)
cvs-mode-diff / buffer *cvs-diff*: iso-latin-1-dos
The diffed file file K3.xml: utf-8-unix
Stefan's patch seem to work. See my other mail.
Bye, Reiner
prev parent reply other threads:[~2009-09-18 11:31 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
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 [this message]
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=20090918133145.24v7djonh4wowgc4@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.