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: Fri, 18 Sep 2009 13:31:45 +0200 Message-ID: <20090918133145.24v7djonh4wowgc4@imap.uni-ulm.de> References: <87skemzrre.fsf@marauder.physik.uni-ulm.de> <83r5u6wqvs.fsf@gnu.org> <20090917162612.l0stf7ln28gc4s8o@imap.uni-ulm.de> <83ljkdwkug.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 1253274469 9017 80.91.229.12 (18 Sep 2009 11:47:49 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Fri, 18 Sep 2009 11:47:49 +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 Fri Sep 18 13:47:42 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 1MobwD-0006vr-CB for geb-bug-gnu-emacs@m.gmane.org; Fri, 18 Sep 2009 13:47:42 +0200 Original-Received: from localhost ([127.0.0.1]:34934 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1MobwC-0006RW-VP for geb-bug-gnu-emacs@m.gmane.org; Fri, 18 Sep 2009 07:47:40 -0400 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1Mobvx-0006Mg-Ai for bug-gnu-emacs@gnu.org; Fri, 18 Sep 2009 07:47:25 -0400 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1Mobvs-0006Ly-9k for bug-gnu-emacs@gnu.org; Fri, 18 Sep 2009 07:47:24 -0400 Original-Received: from [199.232.76.173] (port=38512 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Mobvs-0006Ls-5H for bug-gnu-emacs@gnu.org; Fri, 18 Sep 2009 07:47:20 -0400 Original-Received: from rzlab.ucr.edu ([138.23.92.77]:53200) by monty-python.gnu.org with esmtps (TLS-1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.60) (envelope-from ) id 1Mobvr-0002lz-In for bug-gnu-emacs@gnu.org; Fri, 18 Sep 2009 07:47:19 -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 n8IBl1ag005337; Fri, 18 Sep 2009 04:47:02 -0700 Original-Received: (from debbugs@localhost) by rzlab.ucr.edu (8.14.3/8.14.3/Submit) id n8IBe5Vt004281; Fri, 18 Sep 2009 04:40:05 -0700 Resent-Date: Fri, 18 Sep 2009 04:40:05 -0700 X-Loop: owner@emacsbugs.donarmstrong.com Resent-From: Reiner Steib Resent-To: bug-submit-list@donarmstrong.com Resent-CC: Emacs Bugs 2Resent-Date: Fri, 18 Sep 2009 11:40:05 +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.12532735073143 (code B ref 4451); Fri, 18 Sep 2009 11:40:05 +0000 Original-Received: (at 4451) by emacsbugs.donarmstrong.com; 18 Sep 2009 11:31:47 +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 n8IBVj2M003140 for <4451@emacsbugs.donarmstrong.com>; Fri, 18 Sep 2009 04:31:47 -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 n8IBVjGB019116; Fri, 18 Sep 2009 13:31:45 +0200 (MEST) Original-Received: (from cyrus@localhost) by poseidon.rz.uni-ulm.de (8.14.2/8.14.2/Submit) id n8IBVjiu019115; Fri, 18 Sep 2009 13:31:45 +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; Fri, 18 Sep 2009 13:31:45 +0200 In-Reply-To: <83ljkdwkug.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 monty-python.gnu.org: GNU/Linux 2.6 (newer, 2) Resent-Date: Fri, 18 Sep 2009 07:47:24 -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:31214 Archived-At: Eli Zaretskii 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 | =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 | 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=0924 Jul 2009 16:09:12 -0000=091.2^M | +++ K3.xml=0916 Sep 2009 11:20:27 -0000^M | @@ -1,4365 +1,4379 @@^M | -=09^M^M | -^M^M | -^M^M | +=09^M | +> 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