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, 15 Jul 2010 11:33:15 +0300 Message-ID: <83eif5gn5g.fsf@gnu.org> 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> <20091005180753.1mcmt2jzswoko048@imap.uni-ulm.de> <83fx9xo8vz.fsf@gnu.org> <87tyo1ryyo.fsf@marauder.physik.uni-ulm.de> Reply-To: Eli Zaretskii NNTP-Posting-Host: lo.gmane.org X-Trace: dough.gmane.org 1279184444 25376 80.91.229.12 (15 Jul 2010 09:00:44 GMT) X-Complaints-To: usenet@dough.gmane.org NNTP-Posting-Date: Thu, 15 Jul 2010 09:00:44 +0000 (UTC) Cc: 4451@debbugs.gnu.org To: Reiner Steib Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Thu Jul 15 11:00:39 2010 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.69) (envelope-from ) id 1OZKJ3-0005Di-NI for geb-bug-gnu-emacs@m.gmane.org; Thu, 15 Jul 2010 11:00:38 +0200 Original-Received: from localhost ([127.0.0.1]:55885 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OZKJ3-0000dJ-7i for geb-bug-gnu-emacs@m.gmane.org; Thu, 15 Jul 2010 05:00:37 -0400 Original-Received: from [140.186.70.92] (port=53439 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OZKIr-0000ZA-Ph for bug-gnu-emacs@gnu.org; Thu, 15 Jul 2010 05:00:27 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1OZKIq-0005m8-Es for bug-gnu-emacs@gnu.org; Thu, 15 Jul 2010 05:00:25 -0400 Original-Received: from debbugs.gnu.org ([140.186.70.43]:52211) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1OZKIq-0005m4-D0 for bug-gnu-emacs@gnu.org; Thu, 15 Jul 2010 05:00:24 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.69) (envelope-from ) id 1OZJvG-0007xE-DD; Thu, 15 Jul 2010 04:36:02 -0400 X-Loop: help-debbugs@gnu.org Resent-From: Eli Zaretskii Original-Sender: debbugs-submit-bounces@debbugs.gnu.org Resent-To: owner@debbugs.gnu.org Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Thu, 15 Jul 2010 08:36:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 4451 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: notabug patch Original-Received: via spool by 4451-submit@debbugs.gnu.org id=B4451.127918292730556 (code B ref 4451); Thu, 15 Jul 2010 08:36:02 +0000 Original-Received: (at 4451) by debbugs.gnu.org; 15 Jul 2010 08:35:27 +0000 Original-Received: from localhost ([127.0.0.1] helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1OZJuh-0007wn-H3 for submit@debbugs.gnu.org; Thu, 15 Jul 2010 04:35:27 -0400 Original-Received: from mtaout22.012.net.il ([80.179.55.172]) by debbugs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1OZJue-0007wf-D7 for 4451@debbugs.gnu.org; Thu, 15 Jul 2010 04:35:25 -0400 Original-Received: from conversion-daemon.a-mtaout22.012.net.il by a-mtaout22.012.net.il (HyperSendmail v2007.08) id <0L5L00J00B8N0A00@a-mtaout22.012.net.il> for 4451@debbugs.gnu.org; Thu, 15 Jul 2010 11:35:15 +0300 (IDT) Original-Received: from HOME-C4E4A596F7 ([77.127.120.144]) by a-mtaout22.012.net.il (HyperSendmail v2007.08) with ESMTPA id <0L5L00EF2BUNVUD0@a-mtaout22.012.net.il>; Thu, 15 Jul 2010 11:35:12 +0300 (IDT) In-reply-to: <87tyo1ryyo.fsf@marauder.physik.uni-ulm.de> X-012-Sender: halo1@inter.net.il X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.11 Precedence: list Resent-Date: Thu, 15 Jul 2010 04:36:02 -0400 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 3) X-BeenThere: bug-gnu-emacs@gnu.org 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:38540 Archived-At: > From: Reiner Steib > Cc: 4451@debbugs.gnu.org, Stefan Monnier > Date: Thu, 15 Jul 2010 09:22:39 +0200 > > > So I agree with Stefan that you should simply not overwrite the > > checked-out file with Unix EOLs. We could install the change > > suggested by Stefan (based on this analysis, I no longer object to > > it), > > If nobody else objects, may I install[1] Stefan's patch? Or we could > make it depend on some variable as well ... Fine with me. > +(defvar vc-coding-system-strip-eol t ;; nil > + "When non-nil, don't inherit the EOL part of the coding-system.") Instead of a slightly misleading name (you don't really "strip" EOL) and double negation, I would suggest an option named vc-coding-system-inherit-eol, non-nil by default (to keep the current operation), and reverse the condition in the patch.