Re: gratuitous changes

[Francesco Potorti`]

>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.