From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Reiner Steib Newsgroups: gmane.emacs.bugs Subject: bug#4451: 23.1; EOL problems with vc-diff and cygwin Date: Fri, 18 Sep 2009 13:29:46 +0200 Message-ID: <20090918132946.w1z9vf7py8ow8ggo@imap.uni-ulm.de> References: <87skemzrre.fsf@marauder.physik.uni-ulm.de> <83r5u6wqvs.fsf@gnu.org> <20090917162612.l0stf7ln28gc4s8o@imap.uni-ulm.de> Reply-To: Reiner Steib , 4451@emacsbugs.donarmstrong.com NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1; DelSp="Yes"; format="flowed" Content-Transfer-Encoding: 7bit X-Trace: ger.gmane.org 1253274459 8993 80.91.229.12 (18 Sep 2009 11:47:39 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Fri, 18 Sep 2009 11:47:39 +0000 (UTC) Cc: 4451@emacsbugs.donarmstrong.com To: Stefan Monnier Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Fri Sep 18 13:47:32 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 1Mobw2-0006u6-T1 for geb-bug-gnu-emacs@m.gmane.org; Fri, 18 Sep 2009 13:47:31 +0200 Original-Received: from localhost ([127.0.0.1]:34830 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Mobw2-0006My-5v for geb-bug-gnu-emacs@m.gmane.org; Fri, 18 Sep 2009 07:47:30 -0400 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1Mobvx-0006Mk-El for bug-gnu-emacs@gnu.org; Fri, 18 Sep 2009 07:47:25 -0400 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1Mobvs-0006M4-GT for bug-gnu-emacs@gnu.org; Fri, 18 Sep 2009 07:47:24 -0400 Original-Received: from [199.232.76.173] (port=38513 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Mobvs-0006Lu-5x for bug-gnu-emacs@gnu.org; Fri, 18 Sep 2009 07:47:20 -0400 Original-Received: from rzlab.ucr.edu ([138.23.92.77]:53199) by monty-python.gnu.org with esmtps (TLS-1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.60) (envelope-from ) id 1Mobvr-0002lx-Is for bug-gnu-emacs@gnu.org; Fri, 18 Sep 2009 07:47:19 -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 n8IBl1ae005337; Fri, 18 Sep 2009 04:47:02 -0700 Original-Received: (from debbugs@localhost) by rzlab.ucr.edu (8.14.3/8.14.3/Submit) id n8IBZ3mN003544; Fri, 18 Sep 2009 04:35:03 -0700 Resent-Date: Fri, 18 Sep 2009 04:35:03 -0700 X-Loop: owner@emacsbugs.donarmstrong.com Resent-From: Reiner Steib Resent-To: bug-submit-list@donarmstrong.com Resent-CC: Emacs Bugs 2Resent-Date: Fri, 18 Sep 2009 11:35: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.12532733902739 (code B ref 4451); Fri, 18 Sep 2009 11:35:03 +0000 Original-Received: (at 4451) by emacsbugs.donarmstrong.com; 18 Sep 2009 11:29:50 +0000 X-Spam-Bayes: score:0.5 Bayes not run. spammytokens:Tokens not available. hammytokens:Tokens not available. Original-Received: from mail.uni-ulm.de (mail.uni-ulm.de [134.60.1.11]) by rzlab.ucr.edu (8.14.3/8.14.3/Debian-5) with ESMTP id n8IBTl8v002732 for <4451@emacsbugs.donarmstrong.com>; Fri, 18 Sep 2009 04:29:49 -0700 Original-Received: from poseidon.rz.uni-ulm.de (localhost [127.0.0.1]) by smtp.uni-ulm.de (8.14.2/8.14.2) with ESMTP id n8IBTlNB017940; Fri, 18 Sep 2009 13:29:47 +0200 (MEST) Original-Received: (from cyrus@localhost) by poseidon.rz.uni-ulm.de (8.14.2/8.14.2/Submit) id n8IBTkvM017936; Fri, 18 Sep 2009 13:29:46 +0200 (MEST) Original-Received: from gate-6.ruv.de (gate-6.ruv.de [195.145.180.106]) by imap.uni-ulm.de (Horde MIME library) with HTTP; Fri, 18 Sep 2009 13:29:46 +0200 In-Reply-To: Content-Disposition: inline User-Agent: Internet Messaging Program (IMP) H3 (4.1.5) X-Virus-Scanned: by amavisd-new X-detected-operating-system: by monty-python.gnu.org: GNU/Linux 2.6 (newer, 2) Resent-Date: Fri, 18 Sep 2009 07:47:24 -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:31213 Archived-At: Stefan Monnier wrote: > 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. > - buffer-file-coding-system))) > + (if buffer-file-coding-system > + ;; Don't inherit the EOL part of the coding-system, > + ;; because some diff tools may choose to use > + ;; another one. > + (coding-system-base buffer-file-coding-system))))) Shouldn't the comment mention "bug#4451"? Bye, Reiner