From mboxrd@z Thu Jan 1 00:00:00 1970 Path: main.gmane.org!not-for-mail From: Juanma Barranquero Newsgroups: gmane.emacs.devel Subject: Re: gratuitous changes Date: Sat, 01 Feb 2003 10:54:21 +0100 Sender: emacs-devel-bounces+emacs-devel=quimby.gnus.org@gnu.org Message-ID: <20030201104649.CF7C.LEKTU@terra.es> References: <20030131235443.F7B7.LEKTU@terra.es> <200302010000.h1100nF29021@rum.cs.yale.edu> NNTP-Posting-Host: main.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset="US-ASCII" Content-Transfer-Encoding: 7bit X-Trace: main.gmane.org 1044093282 24040 80.91.224.249 (1 Feb 2003 09:54:42 GMT) X-Complaints-To: usenet@main.gmane.org NNTP-Posting-Date: Sat, 1 Feb 2003 09:54:42 +0000 (UTC) Return-path: Original-Received: from quimby.gnus.org ([80.91.224.244]) by main.gmane.org with esmtp (Exim 3.35 #1 (Debian)) id 18euMD-0006Fc-00 for ; Sat, 01 Feb 2003 10:54:41 +0100 Original-Received: from monty-python.gnu.org ([199.232.76.173]) by quimby.gnus.org with esmtp (Exim 3.12 #1 (Debian)) id 18euSm-0002qa-00 for ; Sat, 01 Feb 2003 11:01:28 +0100 Original-Received: from localhost ([127.0.0.1] helo=monty-python.gnu.org) by monty-python.gnu.org with esmtp (Exim 4.10.13) id 18euMo-00007y-07 for emacs-devel@quimby.gnus.org; Sat, 01 Feb 2003 04:55:18 -0500 Original-Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.10.13) id 18euMI-0007pU-00 for emacs-devel@gnu.org; Sat, 01 Feb 2003 04:54:46 -0500 Original-Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.10.13) id 18euM7-0007D2-00 for emacs-devel@gnu.org; Sat, 01 Feb 2003 04:54:36 -0500 Original-Received: from smtp.terra.es ([213.4.129.129] helo=tsmtp7.mail.isp) by monty-python.gnu.org with esmtp (Exim 4.10.13) id 18euLu-0006NF-00 for emacs-devel@gnu.org; Sat, 01 Feb 2003 04:54:22 -0500 Original-Received: from [80.36.30.211] ([80.36.30.211]) by tsmtp7.mail.isp (terra.es) with ESMTP id H9MJIJ00.KG6; Sat, 1 Feb 2003 10:54:19 +0100 Original-To: "Stefan Monnier" , emacs-devel@gnu.org In-Reply-To: <200302010000.h1100nF29021@rum.cs.yale.edu> X-Mailer: Becky! ver. 2.05.06 X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1b5 Precedence: list List-Id: Emacs development discussions. List-Help: List-Post: List-Subscribe: , List-Archive: List-Unsubscribe: , Errors-To: emacs-devel-bounces+emacs-devel=quimby.gnus.org@gnu.org Xref: main.gmane.org gmane.emacs.devel:11274 X-Report-Spam: http://spam.gmane.org/gmane.emacs.devel:11274 On Fri, 31 Jan 2003 19:00:49 -0500 "Stefan Monnier" wrote: > If we all agree to set things up this way, it's fine. Well, I think we should agree to maintaing Emacs code in a normalized way, so these kinds of conflicts (both CVS-wise and people-wise :) get minimized. > These were not my trailing whitespaces, but the ones that were in > the file to start with and that you removed in a large scale, thus > introducing conflicts in code that you probably didn't even look at. It was on a large scale only because I checked in the Cygwin patch, that's large. I, and others, have been commiting changes with trailing whitespace deleted for months. > I don't understand what you're getting at here. I'm not trying to get anywhere, neither I'm trying to flame or be flamed at. I just was expressing my view that we should settle for doing things the same way (even if it's not my way, yes, but in the issue of trailing whitespace, seems like the simpler answer, long term). Sorry if it came across as angry or whatever. > Note that there is in my mind a significant difference between > purely spuriuous whitespace and whitespace which will naturally be > re-introduced by editing (such as whitespace-only lines which will be > reintroduced by the next TAB). There's no such difference in my mind. I have set an underlined face for the trailing whitespace so I do see it immediately. If I edit something and accidentally introduce the whitespace, I promptly delete it. > I'm not necessarily opposed to stripping all whitespace-only > line, but then let's do it once and for all in a single commit > so even though it will fuck up `cvs diff' output, I will > at least know how I can trivially resolve all the conflicts. I can agree with that. > Stefan "about 200 locally modified files" Ouch :) (Summary of my message: I'm really sorry for bringing trouble to you; but I'd like to fix the "problem" as easily and painlessly as posible.) -- Juanma Barranquero