From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Stefan Monnier Newsgroups: gmane.emacs.bugs Subject: bug#4451: 23.1; EOL problems with vc-diff and cygwin Date: Sat, 26 Sep 2009 20:36:54 -0400 Message-ID: References: <87skemzrre.fsf@marauder.physik.uni-ulm.de> <83r5u6wqvs.fsf@gnu.org> <20090917162612.l0stf7ln28gc4s8o@imap.uni-ulm.de> <20090918132946.w1z9vf7py8ow8ggo@imap.uni-ulm.de> <87skec9t1k.fsf@marauder.physik.uni-ulm.de> <83eipuu9dz.fsf@gnu.org> <87iqf68611.fsf@marauder.physik.uni-ulm.de> <834oqqt63w.fsf@gnu.org> Reply-To: Stefan Monnier , 4451@emacsbugs.donarmstrong.com NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Trace: ger.gmane.org 1254012470 2666 80.91.229.12 (27 Sep 2009 00:47:50 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Sun, 27 Sep 2009 00:47:50 +0000 (UTC) Cc: 4451@emacsbugs.donarmstrong.com, Reiner Steib To: Eli Zaretskii Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Sun Sep 27 02: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 1MrhvS-0005kG-Cx for geb-bug-gnu-emacs@m.gmane.org; Sun, 27 Sep 2009 02:47:42 +0200 Original-Received: from localhost ([127.0.0.1]:49322 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1MrhvR-0008SS-V0 for geb-bug-gnu-emacs@m.gmane.org; Sat, 26 Sep 2009 20:47:41 -0400 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1Mrhv0-0008C7-2c for bug-gnu-emacs@gnu.org; Sat, 26 Sep 2009 20:47:14 -0400 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1Mrhuv-0008Au-Fa for bug-gnu-emacs@gnu.org; Sat, 26 Sep 2009 20:47:13 -0400 Original-Received: from [199.232.76.173] (port=52608 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Mrhuv-0008Ar-BC for bug-gnu-emacs@gnu.org; Sat, 26 Sep 2009 20:47:09 -0400 Original-Received: from rzlab.ucr.edu ([138.23.92.77]:50308) by monty-python.gnu.org with esmtps (TLS-1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.60) (envelope-from ) id 1Mrhuu-0001zU-OG for bug-gnu-emacs@gnu.org; Sat, 26 Sep 2009 20:47:09 -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 n8R0l6vO020487; Sat, 26 Sep 2009 17:47:06 -0700 Original-Received: (from debbugs@localhost) by rzlab.ucr.edu (8.14.3/8.14.3/Submit) id n8R0j4mU020061; Sat, 26 Sep 2009 17:45:04 -0700 Resent-Date: Sat, 26 Sep 2009 17:45:04 -0700 X-Loop: owner@emacsbugs.donarmstrong.com Resent-From: Stefan Monnier Resent-To: bug-submit-list@donarmstrong.com Resent-CC: Emacs Bugs 2Resent-Date: Sun, 27 Sep 2009 00:45:03 +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.125401182219057 (code B ref 4451); Sun, 27 Sep 2009 00:45:03 +0000 Original-Received: (at 4451) by emacsbugs.donarmstrong.com; 27 Sep 2009 00:37:02 +0000 X-Spam-Bayes: score:0.5 Bayes not run. spammytokens:Tokens not available. hammytokens:Tokens not available. Original-Received: from ironport2-out.pppoe.ca (ironport2-out.teksavvy.com [206.248.154.181]) by rzlab.ucr.edu (8.14.3/8.14.3/Debian-5) with ESMTP id n8R0b0q6019024 for <4451@emacsbugs.donarmstrong.com>; Sat, 26 Sep 2009 17:37:01 -0700 X-IronPort-Anti-Spam-Filtered: true X-IronPort-Anti-Spam-Result: AnQFABNQvkpFpYq6/2dsb2JhbACBUNIZhB4Fh30 X-IronPort-AV: E=Sophos;i="4.44,458,1249272000"; d="scan'208";a="46657507" Original-Received: from 69-165-138-186.dsl.teksavvy.com (HELO pastel.home) ([69.165.138.186]) by ironport2-out.pppoe.ca with ESMTP; 26 Sep 2009 20:36:55 -0400 Original-Received: by pastel.home (Postfix, from userid 20848) id 6BE2980B1; Sat, 26 Sep 2009 20:36:54 -0400 (EDT) In-Reply-To: <834oqqt63w.fsf@gnu.org> (Eli Zaretskii's message of "Sat, 26 Sep 2009 12:20:19 +0300") User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/23.1.50 (gnu/linux) X-detected-operating-system: by monty-python.gnu.org: GNU/Linux 2.6 (newer, 2) Resent-Date: Sat, 26 Sep 2009 20:47: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:31542 Archived-At: > What I'd like to see is where in Emacs sources we examine the output > we get from Diff, and where and why we err as to what EOL format > should be used for decoding that output. I don't know what you mean here. > One possibility for this mistake might be that Diff produces > inconsistent EOL format in its output, for example if Diff or its VC > front-end outputs some headers that have Unix EOLs and then the actual > diffs with DOS EOLs. AFAICT, Reiner's situation is that he has a file with (consistent) Unix-style EOLs, and "cvs diff " on that file returns a diff using (consistently) DOS-style EOLs. Currently, VC reads diff's output using the coding-system used for the file, which seems like a sane choice, but in the above case it leads to the problem we've seen. Stefan