From 77315a51c1fb97dc07e1de1105551f8250cdde31 Mon Sep 17 00:00:00 2001 From: Jim Meyering Date: Fri, 13 Jan 2012 10:18:26 +0100 Subject: 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 --- ChangeLog | 8 ++++++++ djgpp/README.in | 2 +- src/parse-gram.c | 2 +- src/parse-gram.y | 2 +- 4 files changed, 11 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index cefbc832..71fc1a0a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2012-01-15 Jim Meyering + + 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 build: avoid warning from coverity about lbitset_elt_find diff --git a/djgpp/README.in b/djgpp/README.in index df29f69b..154c8a29 100644 --- a/djgpp/README.in +++ b/djgpp/README.in @@ -84,7 +84,7 @@ along with this program. If not, see . 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 0244acdf..c64e637d 100644 --- 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 fc648ea1..5f46d293 100644 --- 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++) -- cgit v1.2.1