From: Reiner Steib <reinersteib+gmane@imap.cc>
To: bug-gnu-emacs@gnu.org
Subject: bug#4451: 23.1; EOL problems with vc-diff and cygwin
Date: Wed, 16 Sep 2009 20:08:53 +0200 [thread overview]
Message-ID: <87skemzrre.fsf@marauder.physik.uni-ulm.de> (raw)
[-- Attachment #1: Type: text/plain, Size: 2517 bytes --]
Hi,
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.
[I now noticed that the attached file vc-diff-2.output has _two_ ^M at
each line ending. I'm not sure if these were there already or
if it happened during transport. But it's unlikely because M$ Outlook
sent it base64 encoded.]
The `^M' charaters also break `C-c C-u' (`diff-context->unified').
When using `=' (`cvs-mode-diff') from PCL-CVS mode, there is no problem
(see attached file cvs-mode-diff.output).
Expected behavior: `vc-diff' should behave like `cvs-mode-diff' in this
case.
The file in question is K3.xml; "mode line" -> "describe coding
system" says:
| U -- utf-8-unix (alias: mule-utf-8-unix)
|
| UTF-8 (no signature (BOM))
| Type: utf-8 (UTF-8: Emacs internal multibyte form)
| EOL type: LF
| This coding system encodes the following charsets:
| unicode
More information about/from Emacs:
| ELISP> (executable-find "diff")
| "c:/P.../cygwin/bin/diff.exe"
| ELISP> (shell-command-to-string "diff --version")
| "diff (GNU diffutils) 2.8.7\nWritten [...]"
| ELISP>
|
| In GNU Emacs 23.1.1 (i386-mingw-nt6.0.6001)
| of 2009-07-30 on SOFT-MJASON
| Windowing system distributor `Microsoft Corp.', version 6.0.6001
| configured using `configure --with-gcc (4.4)'
|
| Important settings:
| value of $LC_ALL: nil
| value of $LC_COLLATE: nil
| value of $LC_CTYPE: nil
| value of $LC_MESSAGES: nil
| value of $LC_MONETARY: nil
| value of $LC_NUMERIC: nil
| value of $LC_TIME: nil
| value of $LANG: DEU
| value of $XMODIFIERS: nil
| locale-coding-system: cp1252
| default-enable-multibyte-characters: t
|
| Major mode: Diff
|
| Minor modes in effect:
| cvs-minor-mode: t
| diff-auto-refine-mode: t
| tooltip-mode: t
| tool-bar-mode: t
| mouse-wheel-mode: t
| menu-bar-mode: t
| file-name-shadow-mode: t
| global-font-lock-mode: t
| font-lock-mode: t
| blink-cursor-mode: t
| global-auto-composition-mode: t
| auto-composition-mode: t
| auto-encryption-mode: t
| auto-compression-mode: t
| line-number-mode: t
| transient-mark-mode: t
Information about/from Cygwin:
| GNU bash, version 3.2.39(20)-release (i686-pc-cygwin)
|
| $ file K3.xml
| K3.xml: XML 1.0 document text
| $ file --version
| file-4.21
| magic file from /usr/share/file/magic
|
| $ diff --version
| diff (GNU diffutils) 2.8.7
| $ grep diff ~/.cvsrc
| diff -u
Bye, Reiner
[-- Attachment #2: vc-diff-2.output --]
[-- Type: application/octet-stream, Size: 1301 bytes --]
Index: K3.xml
===================================================================
RCS file: x:/path/to/K3.xml,v
retrieving revision 1.2
diff -u -c -r1.2 K3.xml
cvs.exe diff: conflicting specifications of output style
*** K3.xml 24 Jul 2009 16:09:12 -0000 1.2
--- K3.xml 16 Sep 2009 11:20:27 -0000
***************
*** 1,7 ****
<?xml version='1.0'
encoding='UTF-8'
?>
! <aaaaaa aaaa='K3'
version='2.0.0'
schema-version='1.0.0'
valid='true'
--- 1,7 ----
<?xml version='1.0'
encoding='UTF-8'
?>
! <aaaaaa aaaa='K3_test'
version='2.0.0'
schema-version='1.0.0'
valid='true'
***************
*** 4322,4327 ****
--- 4322,4341 ----
checkDate='11/2005'
isBlockOverridden='No'
isSeverityOverridden='No'
+ />
+ <aaaaaaaaaaaaaaaaaa aaaaa='aaaa://aaa.aaa.aaa/aaa/aaaaaaaaa/aaa'
+ aaaaaaa='1111111'
+ aaaaaaa='aaaa'
+ aaaaaaaa='aaaaaa'
+ aaaaaaaaa='aaaa_aaaaaa_aaaaaaaaaa'
+ aaaaaaaa='aaaaaa'
+ aaaaaaaa='aaaa'
+ aaaaa='aaaaa'
+ aaaaaaaaaaaa=''
+ aaa='aaa 11.111'
+ aaaaaaaaa='1/1111'
+ aaaaaaaaaaaaaaaaa='aa'
+ aaaaaaaaaaaaaaaaaaaa='aaa'
/></aaaaaaaaaaaaaaaaaaaaa>
<aaaaaaaaaaa aaaaa='aaaa://aaa.aaa.aaa/aaa/aaaaaaaaa/aaa'
>
[-- Attachment #3: cvs-mode-diff.output --]
[-- Type: application/octet-stream, Size: 984 bytes --]
Index: K3.xml
===================================================================
RCS file: x:/path/to//K3.xml,v
retrieving revision 1.2
diff -u -r1.2 K3.xml
--- K3.xml 24 Jul 2009 16:09:12 -0000 1.2
+++ K3.xml 16 Sep 2009 11:20:27 -0000
@@ -1,7 +1,7 @@
<?xml version='1.0'
encoding='UTF-8'
?>
-<aaaaaa aaaa='K3'
+<aaaaaa aaaa='K3_test'
version='2.0.0'
schema-version='1.0.0'
valid='true'
@@ -4322,6 +4322,20 @@
aaaaaaaaa='11/1111'
aaaaaaaaaaaaaaaaa='aa'
aaaaaaaaaaaaaaaaaaaa='aa'
+ />
+<aaaaaaaaaaaaaaaaaa aaaaa='aaaa://aaa.aaa.aaa/aaa/aaaaaaaaa/aaa'
+ aaaaaaa='1111111'
+ aaaaaaa='aaaa'
+ aaaaaaaa='aaaaaa'
+ aaaaaaaaa='aaaa_aaaaaa_aaaaaaaaaa'
+ aaaaaaaa='aaaaaa'
+ aaaaaaaa='aaaa'
+ aaaaa='aaaaa'
+ aaaaaaaaaaaa=''
+ aaa='aaa 11.111'
+ aaaaaaaaa='1/1111'
+ aaaaaaaaaaaaaaaaa='aa'
+ aaaaaaaaaaaaaaaaaaaa='aaa'
/></aaaaaaaaaaaaaaaaaaaaa>
<aaaaaaaaaaa aaaaa='aaaa://aaa.aaa.aaa/aaa/aaaaaaaaa/aaa'
>
next reply other threads:[~2009-09-16 18:08 UTC|newest]
Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-09-16 18:08 Reiner Steib [this message]
2009-09-16 20:56 ` bug#4451: 23.1; EOL problems with vc-diff and cygwin 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
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=87skemzrre.fsf@marauder.physik.uni-ulm.de \
--to=reinersteib+gmane@imap.cc \
--cc=4451@emacsbugs.donarmstrong.com \
--cc=Reiner.Steib@gmx.de \
--cc=bug-gnu-emacs@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.