From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Eli Zaretskii Newsgroups: gmane.emacs.bugs Subject: bug#4451: 23.1; EOL problems with vc-diff and cygwin Date: Thu, 17 Sep 2009 20:18:47 +0300 Message-ID: <83ljkdwkug.fsf@gnu.org> References: <87skemzrre.fsf@marauder.physik.uni-ulm.de> <83r5u6wqvs.fsf@gnu.org> <20090917162612.l0stf7ln28gc4s8o@imap.uni-ulm.de> Reply-To: Eli Zaretskii , 4451@emacsbugs.donarmstrong.com NNTP-Posting-Host: lo.gmane.org X-Trace: ger.gmane.org 1253208441 9044 80.91.229.12 (17 Sep 2009 17:27:21 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Thu, 17 Sep 2009 17:27:21 +0000 (UTC) Cc: 4451@emacsbugs.donarmstrong.com To: Reiner Steib Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Thu Sep 17 19:27:14 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 1MoKlG-0000v5-6n for geb-bug-gnu-emacs@m.gmane.org; Thu, 17 Sep 2009 19:27:14 +0200 Original-Received: from localhost ([127.0.0.1]:55140 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1MoKlF-0001QS-LJ for geb-bug-gnu-emacs@m.gmane.org; Thu, 17 Sep 2009 13:27:13 -0400 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1MoKlB-0001Og-5v for bug-gnu-emacs@gnu.org; Thu, 17 Sep 2009 13:27:09 -0400 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1MoKl6-0001G0-FR for bug-gnu-emacs@gnu.org; Thu, 17 Sep 2009 13:27:08 -0400 Original-Received: from [199.232.76.173] (port=45348 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1MoKl6-0001Fx-8R for bug-gnu-emacs@gnu.org; Thu, 17 Sep 2009 13:27:04 -0400 Original-Received: from rzlab.ucr.edu ([138.23.92.77]:58825) by monty-python.gnu.org with esmtps (TLS-1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.60) (envelope-from ) id 1MoKl5-0004EC-ON for bug-gnu-emacs@gnu.org; Thu, 17 Sep 2009 13:27:04 -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 n8HHR1PK027039; Thu, 17 Sep 2009 10:27:01 -0700 Original-Received: (from debbugs@localhost) by rzlab.ucr.edu (8.14.3/8.14.3/Submit) id n8HHP65n026745; Thu, 17 Sep 2009 10:25:06 -0700 Resent-Date: Thu, 17 Sep 2009 10:25:06 -0700 X-Loop: owner@emacsbugs.donarmstrong.com Resent-From: Eli Zaretskii Resent-To: bug-submit-list@donarmstrong.com Resent-CC: Emacs Bugs 2Resent-Date: Thu, 17 Sep 2009 17:25:06 +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.125320793125900 (code B ref 4451); Thu, 17 Sep 2009 17:25:06 +0000 Original-Received: (at 4451) by emacsbugs.donarmstrong.com; 17 Sep 2009 17:18:51 +0000 X-Spam-Bayes: score:0.5 Bayes not run. spammytokens:Tokens not available. hammytokens:Tokens not available. Original-Received: from mtaout6.012.net.il (mtaout6.012.net.il [84.95.2.16]) by rzlab.ucr.edu (8.14.3/8.14.3/Debian-5) with ESMTP id n8HHIngf025897 for <4451@emacsbugs.donarmstrong.com>; Thu, 17 Sep 2009 10:18:50 -0700 Original-Received: from conversion-daemon.i-mtaout6.012.net.il by i-mtaout6.012.net.il (HyperSendmail v2007.08) id <0KQ400A00LEW3W00@i-mtaout6.012.net.il> for 4451@emacsbugs.donarmstrong.com; Thu, 17 Sep 2009 20:18:42 +0300 (IDT) Original-Received: from HOME-C4E4A596F7 ([87.70.38.189]) by i-mtaout6.012.net.il (HyperSendmail v2007.08) with ESMTPA id <0KQ4000GQLF52V70@i-mtaout6.012.net.il>; Thu, 17 Sep 2009 20:18:42 +0300 (IDT) In-reply-to: <20090917162612.l0stf7ln28gc4s8o@imap.uni-ulm.de> X-012-Sender: halo1@inter.net.il X-detected-operating-system: by monty-python.gnu.org: GNU/Linux 2.6 (newer, 2) Resent-Date: Thu, 17 Sep 2009 13:27:08 -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:31174 Archived-At: > Date: Thu, 17 Sep 2009 16:26:12 +0200 > From: Reiner Steib > Cc: 4451@emacsbugs.donarmstrong.com > > > 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. 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.) > 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?