Jim Meyering wrote:
> Eric Blake wrote:
>> On 04/29/2011 01:51 PM, Reuben Thomas wrote:
>>> I'm trying to prepare a small cosmetic patch to fix up a couple of
>>> things I find myself manually fixing up:
>>>
>>> 1. "./NEWS". I considered replacing this with the basename of the NEWS
>>> file, but in fact it seems to me it's better to use the literal "NEWS"
>>> since that makes more sense in the email. What do you think?
>>>
>>> 2. In the email subject, better use $package_name $curr_version than
>>> $my_distdir.
>>>
>>> I would already have sent this patch, but there's another problem: I
>>> use whitespace-mode, and it stumbles because, although I've now set
>>> indent-tabs-mode to t in the file announce-gen (this will be part of
>>> my patch), it turns out that the file is neither one thing nor the
>>> other, since although it mostly uses tabs, it doesn't use tabs in the
>>> usage message, but spaces. Is there some even-more-magic setting I can
>>> use which will make whitespace-mode happy to replace spaces with tabs
>>> in parts of the file but not in other parts, or should I add another
>>> file-local setting to turn it off?
>>
>> Or better yet, change indent-tabs-mode to nil, convert the file to all
>> spaces (no indentation for tabs) as a separate prereq commit to your
>> actual changes, thereby making that file match the style of the rest of
>> gnulib (tabs as indentation only for Makefile snippets and such).
>
> I've just done precisely that.
> Thanks for bringing it up.
>
> Hmm... vc-list-files has the same problem,
> though in its case I'll convert only the leading TABs,
> since some are used to align backslashes, and I have
> a slight preference for TABs there.
Just pushed:
>From 86e6a68e249fd4e4af6cebbfddfc52b33d3f8b37 Mon Sep 17 00:00:00 2001
From: Jim Meyering <meyer...@redhat.com>
Date: Fri, 29 Apr 2011 22:04:07 +0200
Subject: [PATCH] vc-list-files: indent with spaces, not TABs
* build-aux/vc-list-files: Convert leading TABs to spaces,
to match the style of most other files in gnulib.
---
ChangeLog | 4 ++++
build-aux/vc-list-files | 14 +++++++-------
2 files changed, 11 insertions(+), 7 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index bda1204..cbd314e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
2011-04-29 Jim Meyering <meyer...@redhat.com>
+ vc-list-files: indent with spaces, not TABs
+ * build-aux/vc-list-files: Convert leading TABs to spaces,
+ to match the style of most other files in gnulib.
+
announce-gen: indent with spaces, not TABs
* build-aux/announce-gen: Convert all TABs to spaces, to match
the style of most other files in gnulib.
diff --git a/build-aux/vc-list-files b/build-aux/vc-list-files
index 9bb6fe6..2fced25 100755
--- a/build-aux/vc-list-files
+++ b/build-aux/vc-list-files
@@ -2,7 +2,7 @@
# List version-controlled file names.
# Print a version string.
-scriptversion=2010-04-23.22; # UTC
+scriptversion=2011-04-29.20; # UTC
# Copyright (C) 2006-2011 Free Software Foundation, Inc.
@@ -94,12 +94,12 @@ elif test -d CVS; then
eval cvsu --find --types=AFGM '"$dir"' $postprocess
else
eval awk -F/ \''{ \
- if (!$1 && $3 !~ /^-/) { \
- f=FILENAME; \
- if (f ~ /CVS\/Entries$/) \
- f = substr(f, 1, length(f)-11); \
- print f $2; \
- }}'\'' \
+ if (!$1 && $3 !~ /^-/) { \
+ f=FILENAME; \
+ if (f ~ /CVS\/Entries$/) \
+ f = substr(f, 1, length(f)-11); \
+ print f $2; \
+ }}'\'' \
`find "$dir" -name Entries -print` /dev/null' $postprocess
fi
elif test -d .svn; then
--
1.7.5.452.gcf2d0
