[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
grep branch, master, updated. v2.10-24-g18c0337
|
From: |
Paolo Bonzini |
|
Subject: |
grep branch, master, updated. v2.10-24-g18c0337 |
|
Date: |
Wed, 28 Dec 2011 13:58:38 +0000 |
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "grep".
The branch, master has been updated
via 18c0337917db10703c6c5f5265b142971af43e10 (commit)
via f7413d04da7f9f567127c81aef44700935961d0f (commit)
via af5a08dd528dd8ed8d237ba2fe3ae1dab6ede5da (commit)
via 1804fdcd0c0a8d6c4a25d13e5ec4b557eaf2ebb8 (commit)
from d0be2a62a38726211cd94a06fd7e9aa23a88d07d (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
http://git.savannah.gnu.org/cgit/grep.git/commit/?id=18c0337917db10703c6c5f5265b142971af43e10
commit 18c0337917db10703c6c5f5265b142971af43e10
Author: Eli Zaretskii <address@hidden>
Date: Wed Dec 28 14:58:00 2011 +0100
Fix whitespace, indentation and documentation
* src/main.c (parse_grep_colors): Fix indentation.
(usage): Mention MS-Windows in help text for -U and -u options.
diff --git a/src/main.c b/src/main.c
index 0f95ee9..46d2873 100644
--- a/src/main.c
+++ b/src/main.c
@@ -1657,8 +1657,9 @@ Context control:\n\
--color[=WHEN],\n\
--colour[=WHEN] use markers to highlight the matching strings;\n\
WHEN is `always', `never', or `auto'\n\
- -U, --binary do not strip CR characters at EOL (MSDOS)\n\
- -u, --unix-byte-offsets report offsets as if CRs were not there (MSDOS)\n\
+ -U, --binary do not strip CR characters at EOL
(MSDOS/Windows)\n\
+ -u, --unix-byte-offsets report offsets as if CRs were not there\n\
+ (MSDOS/Windows)\n\
\n"));
printf ("%s", _(after_options));
printf (_("\
@@ -1899,16 +1900,16 @@ parse_grep_colors (void)
if (cap->var)
{
if (val)
- *(cap->var) = val;
+ *(cap->var) = val;
else
- error(0, 0, _("in GREP_COLORS=\"%s\", the \"%s\" capacity "
+ error(0, 0, _("in GREP_COLORS=\"%s\", the \"%s\" capacity "
"needs a value (\"=...\"); skipped"), p, name);
- }
- else if (val)
- error(0, 0, _("in GREP_COLORS=\"%s\", the \"%s\" capacity "
- "is boolean and cannot take a value (\"=%s\"); skipped"),
- p, name, val);
- }
+ }
+ else if (val)
+ error(0, 0, _("in GREP_COLORS=\"%s\", the \"%s\" capacity "
+ "is boolean and cannot take a value (\"=%s\");
skipped"),
+ p, name, val);
+ }
if (cap->fct)
{
const char *err_str = cap->fct();
http://git.savannah.gnu.org/cgit/grep.git/commit/?id=f7413d04da7f9f567127c81aef44700935961d0f
commit 18c0337917db10703c6c5f5265b142971af43e10
Author: Eli Zaretskii <address@hidden>
Date: Wed Dec 28 14:58:00 2011 +0100
Fix whitespace, indentation and documentation
* src/main.c (parse_grep_colors): Fix indentation.
(usage): Mention MS-Windows in help text for -U and -u options.
diff --git a/src/main.c b/src/main.c
index 0f95ee9..46d2873 100644
--- a/src/main.c
+++ b/src/main.c
@@ -1657,8 +1657,9 @@ Context control:\n\
--color[=WHEN],\n\
--colour[=WHEN] use markers to highlight the matching strings;\n\
WHEN is `always', `never', or `auto'\n\
- -U, --binary do not strip CR characters at EOL (MSDOS)\n\
- -u, --unix-byte-offsets report offsets as if CRs were not there (MSDOS)\n\
+ -U, --binary do not strip CR characters at EOL
(MSDOS/Windows)\n\
+ -u, --unix-byte-offsets report offsets as if CRs were not there\n\
+ (MSDOS/Windows)\n\
\n"));
printf ("%s", _(after_options));
printf (_("\
@@ -1899,16 +1900,16 @@ parse_grep_colors (void)
if (cap->var)
{
if (val)
- *(cap->var) = val;
+ *(cap->var) = val;
else
- error(0, 0, _("in GREP_COLORS=\"%s\", the \"%s\" capacity "
+ error(0, 0, _("in GREP_COLORS=\"%s\", the \"%s\" capacity "
"needs a value (\"=...\"); skipped"), p, name);
- }
- else if (val)
- error(0, 0, _("in GREP_COLORS=\"%s\", the \"%s\" capacity "
- "is boolean and cannot take a value (\"=%s\"); skipped"),
- p, name, val);
- }
+ }
+ else if (val)
+ error(0, 0, _("in GREP_COLORS=\"%s\", the \"%s\" capacity "
+ "is boolean and cannot take a value (\"=%s\");
skipped"),
+ p, name, val);
+ }
if (cap->fct)
{
const char *err_str = cap->fct();
http://git.savannah.gnu.org/cgit/grep.git/commit/?id=af5a08dd528dd8ed8d237ba2fe3ae1dab6ede5da
commit 18c0337917db10703c6c5f5265b142971af43e10
Author: Eli Zaretskii <address@hidden>
Date: Wed Dec 28 14:58:00 2011 +0100
Fix whitespace, indentation and documentation
* src/main.c (parse_grep_colors): Fix indentation.
(usage): Mention MS-Windows in help text for -U and -u options.
diff --git a/src/main.c b/src/main.c
index 0f95ee9..46d2873 100644
--- a/src/main.c
+++ b/src/main.c
@@ -1657,8 +1657,9 @@ Context control:\n\
--color[=WHEN],\n\
--colour[=WHEN] use markers to highlight the matching strings;\n\
WHEN is `always', `never', or `auto'\n\
- -U, --binary do not strip CR characters at EOL (MSDOS)\n\
- -u, --unix-byte-offsets report offsets as if CRs were not there (MSDOS)\n\
+ -U, --binary do not strip CR characters at EOL
(MSDOS/Windows)\n\
+ -u, --unix-byte-offsets report offsets as if CRs were not there\n\
+ (MSDOS/Windows)\n\
\n"));
printf ("%s", _(after_options));
printf (_("\
@@ -1899,16 +1900,16 @@ parse_grep_colors (void)
if (cap->var)
{
if (val)
- *(cap->var) = val;
+ *(cap->var) = val;
else
- error(0, 0, _("in GREP_COLORS=\"%s\", the \"%s\" capacity "
+ error(0, 0, _("in GREP_COLORS=\"%s\", the \"%s\" capacity "
"needs a value (\"=...\"); skipped"), p, name);
- }
- else if (val)
- error(0, 0, _("in GREP_COLORS=\"%s\", the \"%s\" capacity "
- "is boolean and cannot take a value (\"=%s\"); skipped"),
- p, name, val);
- }
+ }
+ else if (val)
+ error(0, 0, _("in GREP_COLORS=\"%s\", the \"%s\" capacity "
+ "is boolean and cannot take a value (\"=%s\");
skipped"),
+ p, name, val);
+ }
if (cap->fct)
{
const char *err_str = cap->fct();
http://git.savannah.gnu.org/cgit/grep.git/commit/?id=1804fdcd0c0a8d6c4a25d13e5ec4b557eaf2ebb8
commit 18c0337917db10703c6c5f5265b142971af43e10
Author: Eli Zaretskii <address@hidden>
Date: Wed Dec 28 14:58:00 2011 +0100
Fix whitespace, indentation and documentation
* src/main.c (parse_grep_colors): Fix indentation.
(usage): Mention MS-Windows in help text for -U and -u options.
diff --git a/src/main.c b/src/main.c
index 0f95ee9..46d2873 100644
--- a/src/main.c
+++ b/src/main.c
@@ -1657,8 +1657,9 @@ Context control:\n\
--color[=WHEN],\n\
--colour[=WHEN] use markers to highlight the matching strings;\n\
WHEN is `always', `never', or `auto'\n\
- -U, --binary do not strip CR characters at EOL (MSDOS)\n\
- -u, --unix-byte-offsets report offsets as if CRs were not there (MSDOS)\n\
+ -U, --binary do not strip CR characters at EOL
(MSDOS/Windows)\n\
+ -u, --unix-byte-offsets report offsets as if CRs were not there\n\
+ (MSDOS/Windows)\n\
\n"));
printf ("%s", _(after_options));
printf (_("\
@@ -1899,16 +1900,16 @@ parse_grep_colors (void)
if (cap->var)
{
if (val)
- *(cap->var) = val;
+ *(cap->var) = val;
else
- error(0, 0, _("in GREP_COLORS=\"%s\", the \"%s\" capacity "
+ error(0, 0, _("in GREP_COLORS=\"%s\", the \"%s\" capacity "
"needs a value (\"=...\"); skipped"), p, name);
- }
- else if (val)
- error(0, 0, _("in GREP_COLORS=\"%s\", the \"%s\" capacity "
- "is boolean and cannot take a value (\"=%s\"); skipped"),
- p, name, val);
- }
+ }
+ else if (val)
+ error(0, 0, _("in GREP_COLORS=\"%s\", the \"%s\" capacity "
+ "is boolean and cannot take a value (\"=%s\");
skipped"),
+ p, name, val);
+ }
if (cap->fct)
{
const char *err_str = cap->fct();
-----------------------------------------------------------------------
Summary of changes:
NEWS | 8 +-
src/main.c | 267 +++++++++++++++++++++++++++++++++++----
tests/include-exclude | 2 +-
tests/reversed-range-endpoints | 2 +-
tests/warn-char-classes | 1 +
5 files changed, 249 insertions(+), 31 deletions(-)
hooks/post-receive
--
grep
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- grep branch, master, updated. v2.10-24-g18c0337,
Paolo Bonzini <=