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, 17 Sep 2009 16:59:10 -0400 Message-ID: References: <87skemzrre.fsf@marauder.physik.uni-ulm.de> <83r5u6wqvs.fsf@gnu.org> <20090917162612.l0stf7ln28gc4s8o@imap.uni-ulm.de> <83k4zxwkny.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 1253221681 21066 80.91.229.12 (17 Sep 2009 21:08:01 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Thu, 17 Sep 2009 21:08:01 +0000 (UTC) Cc: 4451@emacsbugs.donarmstrong.com, reiner.steib@gmx.de To: Eli Zaretskii Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Thu Sep 17 23:07:53 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 1MoOCj-0001vu-MR for geb-bug-gnu-emacs@m.gmane.org; Thu, 17 Sep 2009 23:07:49 +0200 Original-Received: from localhost ([127.0.0.1]:33928 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1MoOCi-0007Rs-Tk for geb-bug-gnu-emacs@m.gmane.org; Thu, 17 Sep 2009 17:07:48 -0400 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1MoOC7-00074l-2Z for bug-gnu-emacs@gnu.org; Thu, 17 Sep 2009 17:07:11 -0400 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1MoOC2-000727-AP for bug-gnu-emacs@gnu.org; Thu, 17 Sep 2009 17:07:10 -0400 Original-Received: from [199.232.76.173] (port=46736 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1MoOC2-00071q-6T for bug-gnu-emacs@gnu.org; Thu, 17 Sep 2009 17:07:06 -0400 Original-Received: from rzlab.ucr.edu ([138.23.92.77]:53118) by monty-python.gnu.org with esmtps (TLS-1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.60) (envelope-from ) id 1MoOC1-0004EB-N3 for bug-gnu-emacs@gnu.org; Thu, 17 Sep 2009 17:07:05 -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 n8HL71xi032424; Thu, 17 Sep 2009 14:07:02 -0700 Original-Received: (from debbugs@localhost) by rzlab.ucr.edu (8.14.3/8.14.3/Submit) id n8HL58mV032155; Thu, 17 Sep 2009 14:05:08 -0700 Resent-Date: Thu, 17 Sep 2009 14:05:08 -0700 X-Loop: owner@emacsbugs.donarmstrong.com Resent-From: Stefan Monnier Resent-To: bug-submit-list@donarmstrong.com Resent-CC: Emacs Bugs 2Resent-Date: Thu, 17 Sep 2009 21:05:08 +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.125322115430409 (code B ref 4451); Thu, 17 Sep 2009 21:05:08 +0000 Original-Received: (at 4451) by emacsbugs.donarmstrong.com; 17 Sep 2009 20:59:14 +0000 X-Spam-Bayes: score:0.5 Bayes not run. spammytokens:Tokens not available. hammytokens:Tokens not available. Original-Received: from chene.dit.umontreal.ca (chene.dit.umontreal.ca [132.204.246.20]) by rzlab.ucr.edu (8.14.3/8.14.3/Debian-5) with ESMTP id n8HKxBE6030395 for <4451@emacsbugs.donarmstrong.com>; Thu, 17 Sep 2009 13:59:13 -0700 Original-Received: from faina.iro.umontreal.ca (faina.iro.umontreal.ca [132.204.26.177]) by chene.dit.umontreal.ca (8.14.1/8.14.1) with ESMTP id n8HKxA2U029687; Thu, 17 Sep 2009 16:59:10 -0400 Original-Received: by faina.iro.umontreal.ca (Postfix, from userid 20848) id 5C9153A104; Thu, 17 Sep 2009 16:59:10 -0400 (EDT) In-Reply-To: <83k4zxwkny.fsf@gnu.org> (Eli Zaretskii's message of "Thu, 17 Sep 2009 20:22:41 +0300") User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/23.1.50 (gnu/linux) X-NAI-Spam-Score: 0 X-NAI-Spam-Rules: 1 Rules triggered RV3365=0 X-detected-operating-system: by monty-python.gnu.org: GNU/Linux 2.6 (newer, 2) Resent-Date: Thu, 17 Sep 2009 17:07:10 -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:31182 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. > Why do you think so? If we let Emacs (re)discover the EOL of the diff output, we are less likely to get it wrong: - if both the diff markers and the text use Unix EOL, we'll detect it right. - if both the diff markers and the text use DOS EOL, we'll detect it right. - if the diff markers uses DOS EOLs and the text use Unix EOL, we'll detect it as Unix which is about as good as it gets, short of decoding the markers and the text separately. - if the diff markers uses Unix EOLs and the text use DOS EOL, we'll detect it as Unix which is not always ideal, admittedly, but it's still the correct thing to do in some cases (e.g. if the old version of the file used Unix EOL). So maybe, we should drop the provided EOL info (as in my patch) if it says "-unix" but keep it if it says "-dos". > My line of thinking was that a diff of a file with Unix EOLs should > always yield a diffs file with Unix EOLs. Apparently this is not the case for Reiner's setup. Stefan