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: Wed, 16 Sep 2009 23:56:07 +0300 Message-ID: <83r5u6wqvs.fsf@gnu.org> References: <87skemzrre.fsf@marauder.physik.uni-ulm.de> Reply-To: Eli Zaretskii , 4451@emacsbugs.donarmstrong.com NNTP-Posting-Host: lo.gmane.org X-Trace: ger.gmane.org 1253136087 30805 80.91.229.12 (16 Sep 2009 21:21:27 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Wed, 16 Sep 2009 21:21:27 +0000 (UTC) To: Reiner Steib , 4451@emacsbugs.donarmstrong.com Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Wed Sep 16 23:21:19 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 1Mo1wF-0003pD-0H for geb-bug-gnu-emacs@m.gmane.org; Wed, 16 Sep 2009 23:21:19 +0200 Original-Received: from localhost ([127.0.0.1]:39663 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Mo1wE-000838-CU for geb-bug-gnu-emacs@m.gmane.org; Wed, 16 Sep 2009 17:21:18 -0400 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1Mo1wA-00082W-MC for bug-gnu-emacs@gnu.org; Wed, 16 Sep 2009 17:21:14 -0400 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1Mo1w5-0007zW-RG for bug-gnu-emacs@gnu.org; Wed, 16 Sep 2009 17:21:13 -0400 Original-Received: from [199.232.76.173] (port=45125 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Mo1w5-0007zQ-F3 for bug-gnu-emacs@gnu.org; Wed, 16 Sep 2009 17:21:09 -0400 Original-Received: from rzlab.ucr.edu ([138.23.92.77]:57746) by monty-python.gnu.org with esmtps (TLS-1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.60) (envelope-from ) id 1Mo1iR-0007R9-Ie for bug-gnu-emacs@gnu.org; Wed, 16 Sep 2009 17:07:03 -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 n8GL719D022071; Wed, 16 Sep 2009 14:07:01 -0700 Original-Received: (from debbugs@localhost) by rzlab.ucr.edu (8.14.3/8.14.3/Submit) id n8GL55iR021327; Wed, 16 Sep 2009 14:05:05 -0700 Resent-Date: Wed, 16 Sep 2009 14:05:05 -0700 X-Loop: owner@emacsbugs.donarmstrong.com Resent-From: Eli Zaretskii Resent-To: bug-submit-list@donarmstrong.com Resent-CC: Emacs Bugs 2Resent-Date: Wed, 16 Sep 2009 21:05: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.125313457519898 (code B ref 4451); Wed, 16 Sep 2009 21:05:05 +0000 Original-Received: (at 4451) by emacsbugs.donarmstrong.com; 16 Sep 2009 20:56:15 +0000 X-Spam-Bayes: score:0.5 Bayes not run. spammytokens:Tokens not available. hammytokens:Tokens not available. Original-Received: from mtaout1.012.net.il (mtaout1.012.net.il [84.95.2.1]) by rzlab.ucr.edu (8.14.3/8.14.3/Debian-5) with ESMTP id n8GKuDiL019895 for <4451@emacsbugs.donarmstrong.com>; Wed, 16 Sep 2009 13:56:14 -0700 Original-Received: from conversion-daemon.i-mtaout1.012.net.il by i-mtaout1.012.net.il (HyperSendmail v2007.08) id <0KQ300M000Q7CR00@i-mtaout1.012.net.il> for 4451@emacsbugs.donarmstrong.com; Wed, 16 Sep 2009 23:56:03 +0300 (IDT) Original-Received: from HOME-C4E4A596F7 ([87.70.38.189]) by i-mtaout1.012.net.il (HyperSendmail v2007.08) with ESMTPA id <0KQ300F1I0TELR70@i-mtaout1.012.net.il>; Wed, 16 Sep 2009 23:56:03 +0300 (IDT) In-reply-to: <87skemzrre.fsf@marauder.physik.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: Wed, 16 Sep 2009 17:21:13 -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:31151 Archived-At: > From: Reiner Steib > Date: Wed, 16 Sep 2009 20:08:53 +0200 > 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?