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: Thu, 24 Sep 2009 18:07:08 -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> 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 1253902142 8104 80.91.229.12 (25 Sep 2009 18:09:02 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Fri, 25 Sep 2009 18:09:02 +0000 (UTC) To: 4451@emacsbugs.donarmstrong.com Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Fri Sep 25 20:08:55 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 1MrFCW-0007It-Mt for geb-bug-gnu-emacs@m.gmane.org; Fri, 25 Sep 2009 20:07:24 +0200 Original-Received: from localhost ([127.0.0.1]:39565 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1MrFCW-0003B3-7e for geb-bug-gnu-emacs@m.gmane.org; Fri, 25 Sep 2009 14:07:24 -0400 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1MrFCL-00036F-LS for bug-gnu-emacs@gnu.org; Fri, 25 Sep 2009 14:07:13 -0400 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1MrFCH-000341-Jk for bug-gnu-emacs@gnu.org; Fri, 25 Sep 2009 14:07:13 -0400 Original-Received: from [199.232.76.173] (port=55830 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1MrFCH-00033s-BR for bug-gnu-emacs@gnu.org; Fri, 25 Sep 2009 14:07:09 -0400 Original-Received: from rzlab.ucr.edu ([138.23.92.77]:58343) by monty-python.gnu.org with esmtps (TLS-1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.60) (envelope-from ) id 1MrFCG-0006pv-7M for bug-gnu-emacs@gnu.org; Fri, 25 Sep 2009 14:07:08 -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 n8PI74pj017315; Fri, 25 Sep 2009 11:07:06 -0700 Original-Received: (from debbugs@localhost) by rzlab.ucr.edu (8.14.3/8.14.3/Submit) id n8PI05mD015109; Fri, 25 Sep 2009 11:00:05 -0700 Resent-Date: Fri, 25 Sep 2009 11:00:05 -0700 X-Loop: owner@emacsbugs.donarmstrong.com Resent-From: Stefan Monnier Resent-To: bug-submit-list@donarmstrong.com Resent-CC: Emacs Bugs 2Resent-Date: Fri, 25 Sep 2009 18:00: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.125390120214024 (code B ref 4451); Fri, 25 Sep 2009 18:00:05 +0000 Original-Received: (at 4451) by emacsbugs.donarmstrong.com; 25 Sep 2009 17:53:22 +0000 X-Spam-Bayes: score:0.5 Bayes not run. spammytokens:Tokens not available. hammytokens:Tokens not available. Original-Received: from pruche.dit.umontreal.ca (pruche.dit.umontreal.ca [132.204.246.22]) by rzlab.ucr.edu (8.14.3/8.14.3/Debian-5) with ESMTP id n8PHrJBd014020 for <4451@emacsbugs.donarmstrong.com>; Fri, 25 Sep 2009 10:53:21 -0700 Original-Received: from faina.iro.umontreal.ca (faina.iro.umontreal.ca [132.204.26.177]) by pruche.dit.umontreal.ca (8.14.1/8.14.1) with ESMTP id n8PHrHZ1018861; Fri, 25 Sep 2009 13:53:18 -0400 Original-Received: by faina.iro.umontreal.ca (Postfix, from userid 20848) id 0DA713A227; Thu, 24 Sep 2009 18:07:08 -0400 (EDT) In-Reply-To: <87skec9t1k.fsf@marauder.physik.uni-ulm.de> (Reiner Steib's message of "Thu, 24 Sep 2009 19:00:39 +0200") User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/23.1.50 (gnu/linux) X-NAI-Spam-Score: 0.5 X-NAI-Spam-Rules: 2 Rules triggered DATE_IN_PAST_12_24=0.5, RV3371=0 X-NAI-Spam-Level: X-detected-operating-system: by monty-python.gnu.org: GNU/Linux 2.6 (newer, 2) Resent-Date: Fri, 25 Sep 2009 14:07: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:31510 Archived-At: >>> I think the best solution is to change vc-coding-system-for-diff so that >>> when it takes the coding system from (with-current-buffer buf >>> buffer-file-coding-system), it ignores the EOL part of that >>> coding system. >>> Does the patch below help? >> It does help. Thanks. > Any reason not to commit the patch? Eli didn't seem convinced about it. And it may cause poor results in other cases as well. I'm not familiar enough with the issue (which seems to be very w32-specific and depend heavily on the particular diff.exe tool you use), to make a good judgment call. Stefan