maint: avoid "the the"

* djgpp/README.in: s/the the/the/
* src/parse-gram.c (lloc_default): Likewise.
* src/parse-gram.y (lloc_default): Likewise, and remove a
trailing space.

Conflicts:

	ChangeLog
	src/parse-gram.y

diff --git a/ChangeLog b/ChangeLog
index cefbc832c82c9c3a5f86e958a5f676265cfd1edb..71fc1a0a35a720776511458cc8f692585c5ed100 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2012-01-15  Jim Meyering  <meyering@redhat.com>
+
+       maint: avoid "the the"
+       * djgpp/README.in: s/the the/the/
+       * src/parse-gram.c (lloc_default): Likewise.
+       * src/parse-gram.y (lloc_default): Likewise, and remove a
+       trailing space.
+
 2012-01-13  Jim Meyering  <meyering@redhat.com>
 
        build: avoid warning from coverity about lbitset_elt_find

diff --git a/djgpp/README.in b/djgpp/README.in
index df29f69b3cb80abd24ffde3f3eeedae43b3356c7..154c8a293a8d7eb1382eb8b60544028a736653dc 100644 (file)
--- a/djgpp/README.in
+++ b/djgpp/README.in
@@ -84,7 +84,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
        some more work to unpack, if LFN support is not available.  If LFN is
        available then you can extract the source files from the archive with
        any unzip program and proceed to the paragraph 3.3, below.  Any file
-       name issue will be handled by the the DJGPP configuration files.
+       name issue will be handled by the DJGPP configuration files.
        To unpack the source distribution on SFN systems, first, you MUST use
        the `djunpack' batch file to unzip the package.  That is because some
        file names in the official distributions need to be changed to avoid

diff --git a/src/parse-gram.c b/src/parse-gram.c
index 0244acdf35706c32e1e4752283e92005c02e9ac5..c64e637dfe5b30a62529c11b47a92f338c06a019 100644 (file)
--- a/src/parse-gram.c
+++ b/src/parse-gram.c
@@ -3243,7 +3243,7 @@ lloc_default (YYLTYPE const *rhs, int n)
   loc.start = rhs[n].end;
   loc.end = rhs[n].end;
 
-  /* Ignore empty nonterminals the start of the the right-hand side.
+  /* Ignore empty nonterminals the start of the right-hand side.
      Do not bother to ignore them at the end of the right-hand side,
      since empty nonterminals have the same end as their predecessors.  */
   for (i = 1; i <= n; i++)

diff --git a/src/parse-gram.y b/src/parse-gram.y
index fc648ea1860cebf0ce701406993882f4e6e6e5aa..5f46d2935a6c5e66aaa3df0e4097a33d4ff8382b 100644 (file)
--- a/src/parse-gram.y
+++ b/src/parse-gram.y
@@ -686,7 +686,7 @@ lloc_default (YYLTYPE const *rhs, int n)
   loc.start = rhs[n].end;
   loc.end = rhs[n].end;
 
-  /* Ignore empty nonterminals the start of the the right-hand side.
+  /* Ignore empty nonterminals the start of the right-hand side.
      Do not bother to ignore them at the end of the right-hand side,
      since empty nonterminals have the same end as their predecessors.  */
   for (i = 1; i <= n; i++)