From mboxrd@z Thu Jan  1 00:00:00 1970
Path: main.gmane.org!not-for-mail
From: Francesco Potorti` <pot@gnu.org>
Newsgroups: gmane.emacs.devel
Subject: Re: gratuitous changes
Date: 07 Feb 2003 15:02:29 +0100
Sender: emacs-devel-bounces+emacs-devel=quimby.gnus.org@gnu.org
Message-ID: <87el6kyyru.fsf@pot.cnuce.cnr.it>
References: <200301312148.h0VLmG128712@rum.cs.yale.edu>
NNTP-Posting-Host: main.gmane.org
Mime-Version: 1.0
Content-Type: text/plain; charset=us-ascii
X-Trace: main.gmane.org 1044626775 8186 80.91.224.249 (7 Feb 2003 14:06:15 GMT)
X-Complaints-To: usenet@main.gmane.org
NNTP-Posting-Date: Fri, 7 Feb 2003 14:06:15 +0000 (UTC)
Cc: emacs-devel@gnu.org
Return-path: <emacs-devel-bounces+emacs-devel=quimby.gnus.org@gnu.org>
Original-Received: from quimby.gnus.org ([80.91.224.244])
	by main.gmane.org with esmtp (Exim 3.35 #1 (Debian))
	id 18h98w-00027r-00
	for <emacs-devel@main.gmane.org>; Fri, 07 Feb 2003 15:06:14 +0100
Original-Received: from monty-python.gnu.org ([199.232.76.173])
	by quimby.gnus.org with esmtp (Exim 3.12 #1 (Debian))
	id 18h9IV-0004kg-00
	for <emacs-devel@quimby.gnus.org>; Fri, 07 Feb 2003 15:16:08 +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 18h99m-00037A-03
	for emacs-devel@quimby.gnus.org; Fri, 07 Feb 2003 09:07:06 -0500
Original-Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.10.13)
	id 18h99T-00036Z-00
	for emacs-devel@gnu.org; Fri, 07 Feb 2003 09:06:47 -0500
Original-Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.10.13)
	id 18h976-0002R4-00
	for emacs-devel@gnu.org; Fri, 07 Feb 2003 09:04:20 -0500
Original-Received: from pot.cnuce.cnr.it ([146.48.83.182])
	by monty-python.gnu.org with esmtp (Exim 4.10.13)
	id 18h95O-0001eE-00
	for emacs-devel@gnu.org; Fri, 07 Feb 2003 09:02:34 -0500
Original-Received: from pot by pot.cnuce.cnr.it with local (Exim 3.36 #1 (Debian))
	id 18h95J-0000dX-00; Fri, 07 Feb 2003 15:02:29 +0100
Original-To: Stefan Monnier <monnier+gnu/emacs@rum.cs.yale.edu>
In-Reply-To: <200301312148.h0VLmG128712@rum.cs.yale.edu>
Original-Lines: 10
User-Agent: Gnus/5.09 (Gnus v5.9.0) Emacs/21.2.92
X-BeenThere: emacs-devel@gnu.org
X-Mailman-Version: 2.1b5
Precedence: list
List-Id: Emacs development discussions. <emacs-devel.gnu.org>
List-Help: <mailto:emacs-devel-request@gnu.org?subject=help>
List-Post: <mailto:emacs-devel@gnu.org>
List-Subscribe: <http://mail.gnu.org/mailman/listinfo/emacs-devel>,
	<mailto:emacs-devel-request@gnu.org?subject=subscribe>
List-Archive: <http://mail.gnu.org/pipermail/emacs-devel>
List-Unsubscribe: <http://mail.gnu.org/mailman/listinfo/emacs-devel>,
	<mailto:emacs-devel-request@gnu.org?subject=unsubscribe>
Errors-To: emacs-devel-bounces+emacs-devel=quimby.gnus.org@gnu.org
Xref: main.gmane.org gmane.emacs.devel:11462
X-Report-Spam: http://spam.gmane.org/gmane.emacs.devel:11462

>But I still think that what happened with keyboard.c is bad:
>turning every whitespace-only line into an empty line.

I use a hook that deletes useless white space from text and program
sources whenever a file is saved, apart from white space at the cursor.

And I always call diff with the -b option.

The latter should avoid all problems you mention when merging
differences.