grep branch, master, updated. v2.6.3-3-gba099b2

[Jim Meyering]

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  ba099b2939a282974b5d64573a90b19b6055f4a2 (commit)
       via  49cd40d4d2f21ebd867434e13f03fcca22c6e613 (commit)
      from  2ce445c959508f8f6850c47455862301a089727b (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=ba099b2939a282974b5d64573a90b19b6055f4a2


commit ba099b2939a282974b5d64573a90b19b6055f4a2
Author: Jim Meyering <address@hidden>
Date:   Fri Apr 2 12:57:17 2010 +0200

    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.

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

http://git.savannah.gnu.org/cgit/grep.git/commit/?id=49cd40d4d2f21ebd867434e13f03fcca22c6e613


commit ba099b2939a282974b5d64573a90b19b6055f4a2
Author: Jim Meyering <address@hidden>
Date:   Fri Apr 2 12:57:17 2010 +0200

    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.

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

-----------------------------------------------------------------------

Summary of changes:
 Makefile.am      |    2 +-
 configure.ac     |    1 -
 gnulib           |    2 +-
 src/Makefile.am  |    4 +--
 src/main.c       |   16 ++++----
 src/vms_fab.c    |  105 ------------------------------------------------------
 src/vms_fab.h    |   50 -------------------------
 vms/Makefile.am  |   16 --------
 vms/README       |   22 -----------
 vms/config_vms.h |   56 -----------------------------
 vms/make.com     |   71 ------------------------------------
 11 files changed, 11 insertions(+), 334 deletions(-)
 delete mode 100644 src/vms_fab.c
 delete mode 100644 src/vms_fab.h
 delete mode 100644 vms/Makefile.am
 delete mode 100644 vms/README
 delete mode 100644 vms/config_vms.h
 delete mode 100644 vms/make.com


hooks/post-receive
-- 
grep