From mboxrd@z Thu Jan 1 00:00:00 1970 Path: main.gmane.org!not-for-mail From: "Stefan Monnier" Newsgroups: gmane.emacs.devel Subject: Re: gratuitous changes Date: Fri, 31 Jan 2003 19:00:49 -0500 Sender: emacs-devel-bounces+emacs-devel=quimby.gnus.org@gnu.org Message-ID: <200302010000.h1100nF29021@rum.cs.yale.edu> References: <200301312148.h0VLmG128712@rum.cs.yale.edu> <20030131235443.F7B7.LEKTU@terra.es> NNTP-Posting-Host: main.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Trace: main.gmane.org 1044057614 31744 80.91.224.249 (1 Feb 2003 00:00:14 GMT) X-Complaints-To: usenet@main.gmane.org NNTP-Posting-Date: Sat, 1 Feb 2003 00:00:14 +0000 (UTC) Cc: Stefan Monnier Return-path: Original-Received: from quimby.gnus.org ([80.91.224.244]) by main.gmane.org with esmtp (Exim 3.35 #1 (Debian)) id 18el4o-0008FN-00 for ; Sat, 01 Feb 2003 01:00:06 +0100 Original-Received: from monty-python.gnu.org ([199.232.76.173]) by quimby.gnus.org with esmtp (Exim 3.12 #1 (Debian)) id 18elBB-0005sl-00 for ; Sat, 01 Feb 2003 01:06:41 +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 18el6V-0006Zu-05 for emacs-devel@quimby.gnus.org; Fri, 31 Jan 2003 19:01:51 -0500 Original-Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.10.13) id 18el5r-00069y-00 for emacs-devel@gnu.org; Fri, 31 Jan 2003 19:01:11 -0500 Original-Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.10.13) id 18el5o-00064l-00 for emacs-devel@gnu.org; Fri, 31 Jan 2003 19:01:08 -0500 Original-Received: from rum.cs.yale.edu ([128.36.229.169]) by monty-python.gnu.org with esmtp (Exim 4.10.13) id 18el5X-0005ka-00 for emacs-devel@gnu.org; Fri, 31 Jan 2003 19:00:51 -0500 Original-Received: (from monnier@localhost) by rum.cs.yale.edu (8.11.6/8.11.6) id h1100nF29021; Fri, 31 Jan 2003 19:00:49 -0500 X-Mailer: exmh version 2.4 06/23/2000 with nmh-1.0.4 Original-To: Juanma Barranquero Original-cc: emacs-devel@gnu.org 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:11267 X-Report-Spam: http://spam.gmane.org/gmane.emacs.devel:11267 > I *am* careful. I just happen to think that keeping trailing whitespace > around is ugly and a PITA, so I have delete-trailing-whitespace on > write-file-functions. If we all agree to set things up this way, it's fine. Otherwise it's a recipe for painful CVS merging. [ Note: such a setting can introduce subtle bugs with lines ending in an elisp space constant such as ?\ , so we have to be careful with it. ] > Even if I took it out, if you maintaing your own > local changes with trailing whitespace you're going to be bitten by it > every now and then. 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. > As you said yourself that you don't like the > whitespace and delete it sometimes, I don't understand why don't keep > your changes that way and save yourself the trouble... I don't understand what you're getting at here. 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). I think the difference is actually not just in my mind: virtually every file in Emacs CVS has many whitespace-only lines, whereas most of those files have almost no trailing whitespace on non-empty lines. 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. Stefan "about 200 locally modified files"