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: Thu, 24 Sep 2009 19:00:39 +0200 Message-ID: <87skec9t1k.fsf@marauder.physik.uni-ulm.de> References: <87skemzrre.fsf@marauder.physik.uni-ulm.de> <83r5u6wqvs.fsf@gnu.org> <20090917162612.l0stf7ln28gc4s8o@imap.uni-ulm.de> <20090918132946.w1z9vf7py8ow8ggo@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=us-ascii X-Trace: ger.gmane.org 1253812118 6894 80.91.229.12 (24 Sep 2009 17:08:38 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Thu, 24 Sep 2009 17:08:38 +0000 (UTC) To: 4451@emacsbugs.donarmstrong.com Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Thu Sep 24 19:08:21 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 1MqrnC-0004yl-Dv for geb-bug-gnu-emacs@m.gmane.org; Thu, 24 Sep 2009 19:07:42 +0200 Original-Received: from localhost ([127.0.0.1]:34034 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1MqrnB-00089v-UT for geb-bug-gnu-emacs@m.gmane.org; Thu, 24 Sep 2009 13:07:41 -0400 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1Mqrmm-0007xL-8A for bug-gnu-emacs@gnu.org; Thu, 24 Sep 2009 13:07:16 -0400 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1Mqrmh-0007sc-8A for bug-gnu-emacs@gnu.org; Thu, 24 Sep 2009 13:07:15 -0400 Original-Received: from [199.232.76.173] (port=38152 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Mqrmg-0007s2-FB for bug-gnu-emacs@gnu.org; Thu, 24 Sep 2009 13:07:10 -0400 Original-Received: from rzlab.ucr.edu ([138.23.92.77]:39633) by monty-python.gnu.org with esmtps (TLS-1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.60) (envelope-from ) id 1Mqrme-0003s4-0t for bug-gnu-emacs@gnu.org; Thu, 24 Sep 2009 13:07: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 n8OH74wA022988; Thu, 24 Sep 2009 10:07:05 -0700 Original-Received: (from debbugs@localhost) by rzlab.ucr.edu (8.14.3/8.14.3/Submit) id n8OH5Agk022712; Thu, 24 Sep 2009 10:05:10 -0700 Resent-Date: Thu, 24 Sep 2009 10:05:10 -0700 X-Loop: owner@emacsbugs.donarmstrong.com Resent-From: Reiner Steib Resent-To: bug-submit-list@donarmstrong.com Resent-CC: Emacs Bugs 2Resent-Date: Thu, 24 Sep 2009 17:05:10 +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.125381164721503 (code B ref 4451); Thu, 24 Sep 2009 17:05:10 +0000 Original-Received: (at 4451) by emacsbugs.donarmstrong.com; 24 Sep 2009 17:00:47 +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 n8OH0js0021500 for <4451@emacsbugs.donarmstrong.com>; Thu, 24 Sep 2009 10:00:46 -0700 Original-Received: from bridgekeeper.physik.uni-ulm.de (bridgekeeper.physik.uni-ulm.de [134.60.10.175]) by mail.uni-ulm.de (8.14.2/8.14.2) with ESMTP id n8OH0giG029551; Thu, 24 Sep 2009 19:00:43 +0200 (MEST) Original-Received: from localhost (localhost [127.0.0.1]) by bridgekeeper.physik.uni-ulm.de (Postfix) with ESMTP id 421191CE66; Thu, 24 Sep 2009 19:00:42 +0200 (CEST) X-Face: 1; h7XMU[7l}$T@J.D}5z*w8Tg'}B5ArAWc8>2X~otB; kOjKs8X%|hTC#dG:%Vpx")x7S/`v :VXU#fZW$X$zdhEU.RfVQ@<-m9IuN{Hm"fW{,5]6kR'M*vEs+{5Cj!L(JTRzA$(},?5J=sm; %Od, Eli Zaretskii In-Reply-To: <20090918132946.w1z9vf7py8ow8ggo@imap.uni-ulm.de> (Reiner Steib's message of "Fri, 18 Sep 2009 13:29:46 +0200") User-Agent: Gnus/5.110011 (No Gnus v0.11) Emacs/22.1 (gnu/linux) X-DCC-SIHOPE-DCC-3-Metrics: poseidon 1085; Body=3 Fuz1=3 Fuz2=3 X-Virus-Scanned: by amavisd-new X-detected-operating-system: by monty-python.gnu.org: GNU/Linux 2.6 (newer, 2) Resent-Date: Thu, 24 Sep 2009 13:07:15 -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:31459 Archived-At: On Fri, Sep 18 2009, Reiner Steib wrote: > 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. Any reason not to commit the patch? >> - 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. -- ,,, (o o) ---ooO-(_)-Ooo--- | PGP key available | http://rsteib.home.pages.de/