[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [bug-diffutils] Bug#648411: diffutils: description of -I option is w
From: |
Paul Eggert |
Subject: |
Re: [bug-diffutils] Bug#648411: diffutils: description of -I option is wrong (fwd) |
Date: |
Sun, 04 Mar 2012 13:24:00 -0800 |
User-agent: |
Mozilla/5.0 (X11; Linux i686; rv:10.0.2) Gecko/20120216 Thunderbird/10.0.2 |
Thanks, I applied this to the diffutils master branch:
>From a96c4da999cc1704146ea0eb7ba86c6dbbea1cad Mon Sep 17 00:00:00 2001
From: Paul Eggert <address@hidden>
Date: Sun, 4 Mar 2012 13:19:55 -0800
Subject: [PATCH] doc: explain -I RE better in --help output
* src/diff.c, src/sdiff.c (option_help_msgid): For -I RE,
change "whose lines all match" to "all whose lines match" to avoid
unintended interpretation. Reported by Danijel Tasov in
<http://bugs.debian.org/648411>.
---
src/diff.c | 2 +-
src/sdiff.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/diff.c b/src/diff.c
index 200112b..85950fa 100644
--- a/src/diff.c
+++ b/src/diff.c
@@ -894,7 +894,7 @@ static char const * const option_help_msgid[] = {
N_("-b, --ignore-space-change ignore changes in the amount of white
space"),
N_("-w, --ignore-all-space ignore all white space"),
N_("-B, --ignore-blank-lines ignore changes whose lines are all
blank"),
- N_("-I, --ignore-matching-lines=RE ignore changes whose lines all match
RE"),
+ N_("-I, --ignore-matching-lines=RE ignore changes all whose lines match
RE"),
"",
N_("-a, --text treat all files as text"),
N_(" --strip-trailing-cr strip trailing carriage return on
input"),
diff --git a/src/sdiff.c b/src/sdiff.c
index ceda3db..63b2861 100644
--- a/src/sdiff.c
+++ b/src/sdiff.c
@@ -175,7 +175,7 @@ static char const * const option_help_msgid[] = {
N_("-b, --ignore-space-change ignore changes in the amount of white
space"),
N_("-W, --ignore-all-space ignore all white space"),
N_("-B, --ignore-blank-lines ignore changes whose lines are all blank"),
- N_("-I, --ignore-matching-lines=RE ignore changes whose lines all match
RE"),
+ N_("-I, --ignore-matching-lines=RE ignore changes all whose lines match
RE"),
N_(" --strip-trailing-cr strip trailing carriage return on input"),
N_("-a, --text treat all files as text"),
"",
--
1.7.6.5