bug-grep
[Top][All Lists]
Advanced

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

[PATCH] build: update gnulib submodule to latest, and adjust


From: Jim Meyering
Subject: [PATCH] build: update gnulib submodule to latest, and adjust
Date: Fri, 02 Apr 2010 14:53:51 +0200

FYI,

>From ba099b2939a282974b5d64573a90b19b6055f4a2 Mon Sep 17 00:00:00 2001
From: Jim Meyering <address@hidden>
Date: Fri, 2 Apr 2010 12:57:17 +0200
Subject: [PATCH] build: update gnulib submodule to latest, and adjust

* src/main.c (parse_grep_colors): Adjust diagnostics not to trigger
the sc_error_message_period and sc_error_message_uppercase
syntax-check rules.
---
 gnulib     |    2 +-
 src/main.c |   16 ++++++++--------
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/gnulib b/gnulib
index 6207255..463a2f8 160000
--- a/gnulib
+++ b/gnulib
@@ -1 +1 @@
-Subproject commit 6207255863f1fb5172ead8b03cda5e4b0b7336a4
+Subproject commit 463a2f81e2b9497150f0291c822c37b212cbe997
diff --git a/src/main.c b/src/main.c
index 1697c80..b4a2e94 100644
--- a/src/main.c
+++ b/src/main.c
@@ -1690,20 +1690,20 @@ parse_grep_colors (void)
                if (val)
               *(cap->var) = val;
                else
-              error(0, 0, _("In GREP_COLORS=\"%s\", the \"%s\" capacity "
-                               "needs a value (\"=...\"); skipped."), p, name);
+              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);
+          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();

            if (err_str)
-             error(0, 0, _("In GREP_COLORS=\"%s\", the \"%s\" capacity %s."),
+             error(0, 0, _("in GREP_COLORS=\"%s\", the \"%s\" capacity %s"),
                    p, name, err_str);
          }
        if (c == '\0')
@@ -1726,8 +1726,8 @@ parse_grep_colors (void)
       goto ill_formed;

  ill_formed:
-  error(0, 0, _("Stopped processing of ill-formed GREP_COLORS=\"%s\" "
-               "at remaining substring \"%s\"."), p, q);
+  error(0, 0, _("stopped processing of ill-formed GREP_COLORS=\"%s\" "
+               "at remaining substring \"%s\""), p, q);
 }

 int
--
1.7.0.4.293.ga50de




reply via email to

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