From: Jim Meyering Date: Sun, 10 Jun 2012 19:49:59 +0000 (+0200) Subject: maint.mk: prohibit common grammar error: "all these" X-Git-Tag: v0.1~627 X-Git-Url: http://erislabs.net/gitweb/?p=gnulib.git;a=commitdiff_plain;h=70a9bd65b77ec4e516f500e7348bc1c332d91ea5 maint.mk: prohibit common grammar error: "all these" * top/maint.mk (prohibit_undesirable_word_seq_RE_): Add "all these" to the list of prohibited word sequences. It should be "all of these". * lib/tempname.c (__gen_tempname): Fix one of them. --- diff --git a/ChangeLog b/ChangeLog index 55a459b42..7f27d1795 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2012-06-10 Jim Meyering + + maint.mk: prohibit common grammar error: "all these" + * top/maint.mk (prohibit_undesirable_word_seq_RE_): Add "all these" to + the list of prohibited word sequences. It should be "all of these". + * lib/tempname.c (__gen_tempname): Fix one of them. + 2012-06-07 Akim Demaille do-release-commit-and-tag: support VPATH builds diff --git a/lib/tempname.c b/lib/tempname.c index de0474d82..26a38ce33 100644 --- a/lib/tempname.c +++ b/lib/tempname.c @@ -207,7 +207,7 @@ __gen_tempname (char *tmpl, int suffixlen, int flags, int kind) /* A lower bound on the number of temporary files to attempt to generate. The maximum total number of temporary file names that can exist for a given template is 62**6. It should never be - necessary to try all these combinations. Instead if a reasonable + necessary to try all of these combinations. Instead if a reasonable number of names is tried (we define reasonable as 62**3) fail to give the system administrator the chance to remove the problems. */ #define ATTEMPTS_MIN (62 * 62 * 62) diff --git a/top/maint.mk b/top/maint.mk index f0b889bc9..bcdbe0129 100644 --- a/top/maint.mk +++ b/top/maint.mk @@ -948,7 +948,7 @@ sc_prohibit_doubled_word: bad_xref_re_ ?= (?:[\w,:;] +|(?:see|also)\s+)\@xref\{ bad_pxref_re_ ?= (?:[.!?]|(?:see|also))\s+\@pxref\{ prohibit_undesirable_word_seq_RE_ ?= \ - /(?:\bcan\s+not\b|$(bad_xref_re_)|$(bad_pxref_re_))/gims + /(?:\bcan\s+not\b|\ball these\b|$(bad_xref_re_)|$(bad_pxref_re_))/gims prohibit_undesirable_word_seq_ = \ -e 'while ($(prohibit_undesirable_word_seq_RE_))' \ $(perl_filename_lineno_text_)