bug-gnulib
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

prohibit "the the"; fix an "a a"


From: Jim Meyering
Subject: prohibit "the the"; fix an "a a"
Date: Sat, 09 Apr 2011 23:21:12 +0200

Here are a few more.
I don't want to prohibit "a a", in part because
it is a lot more prone to false positives than "the the".

>From bd71117029b364e6aae441d20d9f941b9b8537cd Mon Sep 17 00:00:00 2001
From: Jim Meyering <address@hidden>
Date: Sat, 9 Apr 2011 23:15:02 +0200
Subject: [PATCH 1/3] maint: fix "the the" in comment

* lib/count-one-bits.h: s/the the/the/
---
 ChangeLog            |    3 +++
 lib/count-one-bits.h |    2 +-
 2 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index e01dd6b..f523592 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2011-04-09  Jim Meyering  <address@hidden>

+       maint: fix "the the" in comment
+       * lib/count-one-bits.h: s/the the/the/
+
        maint: change "can not" to "cannot"
        But do not change the occurrences in maintain.texi or in
        build-aux/po/Makefile.in.in, which I presume comes from gettext.
diff --git a/lib/count-one-bits.h b/lib/count-one-bits.h
index 930e861..093165c 100644
--- a/lib/count-one-bits.h
+++ b/lib/count-one-bits.h
@@ -38,7 +38,7 @@
           count += count_one_bits_32 (x >> 31 >> 1);                        \
         return count;

-/* Compute and return the the number of 1-bits set in the least
+/* Compute and return the number of 1-bits set in the least
    significant 32 bits of X. */
 static inline int
 count_one_bits_32 (unsigned int x)
--
1.7.5.rc1.228.g86d60b


>From e9c8923d36e608241c829a06e1dc4a0931d961fa Mon Sep 17 00:00:00 2001
From: Jim Meyering <address@hidden>
Date: Sat, 9 Apr 2011 23:18:14 +0200
Subject: [PATCH 2/3] maint.mk: prohibit \<the the\>

* top/maint.mk (sc_prohibit_the_the): New rule.
---
 ChangeLog    |    3 +++
 top/maint.mk |    5 +++++
 2 files changed, 8 insertions(+), 0 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index f523592..521aefa 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2011-04-09  Jim Meyering  <address@hidden>

+       maint.mk: prohibit \<the the\>
+       * top/maint.mk (sc_prohibit_the_the): New rule.
+
        maint: fix "the the" in comment
        * lib/count-one-bits.h: s/the the/the/

diff --git a/top/maint.mk b/top/maint.mk
index 823e46c..427dff3 100644
--- a/top/maint.mk
+++ b/top/maint.mk
@@ -841,6 +841,11 @@ sc_prohibit_S_IS_definition:
        halt='do not define S_IS* macros; include <sys/stat.h>'         \
          $(_sc_search_regexp)

+sc_prohibit_the_the:
+       @prohibit='\<the[ ]the\>'                                       \
+       halt='avoid double "the"'                                       \
+         $(_sc_search_regexp)
+
 sc_prohibit_can_not:
        @prohibit='\<can[ ]not\>'                                       \
        halt='use "cannot", not "can'' not"'                            \
--
1.7.5.rc1.228.g86d60b


>From 135351c549050196b5c1322b3ab1e956565ab3d8 Mon Sep 17 00:00:00 2001
From: Jim Meyering <address@hidden>
Date: Sat, 9 Apr 2011 23:18:59 +0200
Subject: [PATCH 3/3] maint: change "a a" to "a"

* tests/test-lchown.h (test_lchown): s/a a/a/
---
 ChangeLog           |    3 +++
 tests/test-lchown.h |    2 +-
 2 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 521aefa..f1c5c3a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2011-04-09  Jim Meyering  <address@hidden>

+       maint: change "a a" to "a"
+       * tests/test-lchown.h (test_lchown): s/a a/a/
+
        maint.mk: prohibit \<the the\>
        * top/maint.mk (sc_prohibit_the_the): New rule.

diff --git a/tests/test-lchown.h b/tests/test-lchown.h
index aa10674..229ed6b 100644
--- a/tests/test-lchown.h
+++ b/tests/test-lchown.h
@@ -46,7 +46,7 @@ test_lchown (int (*func) (char const *, uid_t, gid_t), bool 
print)
   int result;

   /* Solaris 8 is interesting - if the current process belongs to
-     multiple groups, the current directory is owned by a a group that
+     multiple groups, the current directory is owned by a group that
      the current process belongs to but different than getegid(), and
      the current directory does not have the S_ISGID bit, then regular
      files created in the directory belong to the directory's group,
--
1.7.5.rc1.228.g86d60b



reply via email to

[Prev in Thread] Current Thread [Next in Thread]