grep branch, master, updated. v2.15-18-gfb4d5a8

[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  fb4d5a856f322187f8dc00f3d50381f39531f43e (commit)
       via  addaf78111fe139ec6ca46e36d2a6a48e26f64c7 (commit)
      from  0a0764b4f61c2f7988f5144128dfaba4f869e53b (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=fb4d5a856f322187f8dc00f3d50381f39531f43e


commit fb4d5a856f322187f8dc00f3d50381f39531f43e
Author: Jim Meyering <address@hidden>
Date:   Wed Dec 25 17:59:05 2013 -0800

    maint: fix inconsistent spacing in expression
    
    * src/main.c (prline): Fix inconsistent spacing in expression:
    s/  / /.

diff --git a/src/main.c b/src/main.c
index 2168a0a..65e2942 100644
--- a/src/main.c
+++ b/src/main.c
@@ -931,7 +931,7 @@ prline (char const *beg, char const *lim, int sep)
     line_color = match_color = NULL; /* Shouldn't be used.  */
 
   if ((only_matching && matching)
-      || (color_option  && (*line_color || *match_color)))
+      || (color_option && (*line_color || *match_color)))
     {
       /* We already know that non-matching lines have no match (to colorize). 
*/
       if (matching && (only_matching || *match_color))

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


commit fb4d5a856f322187f8dc00f3d50381f39531f43e
Author: Jim Meyering <address@hidden>
Date:   Wed Dec 25 17:59:05 2013 -0800

    maint: fix inconsistent spacing in expression
    
    * src/main.c (prline): Fix inconsistent spacing in expression:
    s/  / /.

diff --git a/src/main.c b/src/main.c
index 2168a0a..65e2942 100644
--- a/src/main.c
+++ b/src/main.c
@@ -931,7 +931,7 @@ prline (char const *beg, char const *lim, int sep)
     line_color = match_color = NULL; /* Shouldn't be used.  */
 
   if ((only_matching && matching)
-      || (color_option  && (*line_color || *match_color)))
+      || (color_option && (*line_color || *match_color)))
     {
       /* We already know that non-matching lines have no match (to colorize). 
*/
       if (matching && (only_matching || *match_color))

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

Summary of changes:
 src/dfa.c  |    2 +-
 src/main.c |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
grep