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 55a459b..7f27d17 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2012-06-10  Jim Meyering  <meyering@redhat.com>
+
+       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  <akim@lrde.epita.fr>
 
        do-release-commit-and-tag: support VPATH builds

diff --git a/lib/tempname.c b/lib/tempname.c
index de0474d..26a38ce 100644 (file)
--- 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 f0b889b..bcdbe01 100644 (file)
--- 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_)