Skip to content

Commit badccff

Browse files
meyeringmeyering
committed
maint: convert all TABs to equivalent spaces in indentation
Using this file, cat > leading-blank.exempt <<\EOF (\.gitmodules|help2man|pre-commit)$ (?:^|\/)ChangeLog[^/]*$ (?:^|\/)(?:GNU)?[Mm]akefile[^/]*$ \.(?:am|mk)$ EOF run the following command to convert all non-conforming leading white space to be all spaces: git ls-files \ | pcregrep -vf leading-blank.exempt \ | xargs pcregrep -l '^ *\t' \ | xargs perl -MText::Tabs -ni -le \ '$m=/^( *\t[ \t]*)(.*)/; print $m ? expand($1) . $2 : $_' Since that changed old NEWS, I also ran "make update-NEWS-hash" to update the old_NEWS_hash value in cfg.mk.
1 parent 601eceb commit badccff

17 files changed

Lines changed: 3354 additions & 3354 deletions

File tree

‎NEWS‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -343,12 +343,12 @@ User-visible changes in version 2.4:
343343
printed according to the printf specification.
344344
E.g. '%5df' prints the number of the first line in the
345345
group in the old file using the "%5d" format.
346-
e: line number just before the group in old file; equals f - 1
347-
f: first line number in group in the old file
348-
l: last line number in group in the old file
349-
m: line number just after the group in old file; equals l + 1
350-
n: number of lines in group in the old file; equals l - f + 1
351-
E, F, L, M, N: likewise, for lines in the new file
346+
e: line number just before the group in old file; equals f - 1
347+
f: first line number in group in the old file
348+
l: last line number in group in the old file
349+
m: line number just after the group in old file; equals l + 1
350+
n: number of lines in group in the old file; equals l - f + 1
351+
E, F, L, M, N: likewise, for lines in the new file
352352
%(A=B?T:E)
353353
If A equals B then T else E. A and B are each either a decimal
354354
constant or a single letter interpreted as above. T and E are

‎cfg.mk‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ announcement_Cc_ = $(translation_project_), $(PACKAGE)[email protected]
3535
# Now that we have better tests, make this the default.
3636
export VERBOSE = yes
3737

38-
old_NEWS_hash = d8faba8d05054af539f24d3649992207
38+
old_NEWS_hash = 883954bcb25c48755004736540de39e7
3939

4040
# Tell maint.mk's syntax-check rules that diff gets config.h directly or
4141
# via diff.h or system.h.

‎exgettext‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ generate_emsgids='
9797
line = substr(line, percent_index + 2)
9898
bracket_index = index(line, "}")
9999
if (bracket_index == 0) {
100-
continue
100+
continue
101101
}
102102
msgid = substr(line, 1, bracket_index - 1)
103103
if (index(msgid, "%") != 0) {

‎lib/cmpbuf.c‎

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -54,28 +54,28 @@ block_read (int fd, char *buf, size_t nbytes)
5454
size_t bytes_to_read = MIN (bytes_remaining, readlim);
5555
ssize_t nread = read (fd, bp, bytes_to_read);
5656
if (nread <= 0)
57-
{
58-
if (nread == 0)
59-
break;
60-
61-
/* Accommodate Tru64 5.1, which can't read more than INT_MAX
62-
bytes at a time. They call that a 64-bit OS? */
63-
if (errno == EINVAL && INT_MAX < bytes_to_read)
64-
{
65-
readlim = INT_MAX;
66-
continue;
67-
}
68-
69-
/* This is needed for programs that have signal handlers on
70-
older hosts without SA_RESTART. It also accommodates
71-
ancient AIX hosts that set errno to EINTR after uncaught
72-
SIGCONT. See <news:[email protected]>
73-
(1993-04-22). */
74-
if (! SA_RESTART && errno == EINTR)
75-
continue;
76-
77-
return SIZE_MAX;
78-
}
57+
{
58+
if (nread == 0)
59+
break;
60+
61+
/* Accommodate Tru64 5.1, which can't read more than INT_MAX
62+
bytes at a time. They call that a 64-bit OS? */
63+
if (errno == EINVAL && INT_MAX < bytes_to_read)
64+
{
65+
readlim = INT_MAX;
66+
continue;
67+
}
68+
69+
/* This is needed for programs that have signal handlers on
70+
older hosts without SA_RESTART. It also accommodates
71+
ancient AIX hosts that set errno to EINTR after uncaught
72+
SIGCONT. See <news:[email protected]>
73+
(1993-04-22). */
74+
if (! SA_RESTART && errno == EINTR)
75+
continue;
76+
77+
return SIZE_MAX;
78+
}
7979
bp += nread;
8080
}
8181
while (bp < buflim);

‎lib/prepargs.c‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -52,16 +52,16 @@ prepend_args (char const *options, char *buf, char **argv)
5252
for (;;)
5353
{
5454
while (ISSPACE ((unsigned char) *o))
55-
o++;
55+
o++;
5656
if (!*o)
57-
return n;
57+
return n;
5858
if (argv)
59-
argv[n] = b;
59+
argv[n] = b;
6060
n++;
6161

6262
do
63-
if ((*b++ = *o++) == '\\' && *o)
64-
b[-1] = *o++;
63+
if ((*b++ = *o++) == '\\' && *o)
64+
b[-1] = *o++;
6565
while (*o && ! ISSPACE ((unsigned char) *o));
6666

6767
*b++ = '\0';
@@ -86,6 +86,6 @@ prepend_default_options (char const *options, int *pargc, char ***pargv)
8686
*pp++ = *argv++;
8787
pp += prepend_args (options, buf, pp);
8888
while ((*pp++ = *argv++))
89-
continue;
89+
continue;
9090
}
9191
}

0 commit comments

Comments
 (0)