grep branch, master, updated. v2.15-16-g0a0764b

[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  0a0764b4f61c2f7988f5144128dfaba4f869e53b (commit)
      from  178ed7cc324bc2000c19a3f7a4be649dfa99b44a (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=0a0764b4f61c2f7988f5144128dfaba4f869e53b


commit 0a0764b4f61c2f7988f5144128dfaba4f869e53b
Author: Jim Meyering <address@hidden>
Date:   Mon Dec 23 12:33:12 2013 -0800

    maint: fix/improve a comment
    
    * src/main.c (prline): Replace untrue FIXME comment with one
    telling how the hard-to-reach code can be exercised.

diff --git a/src/main.c b/src/main.c
index 1dfbcb6..2168a0a 100644
--- a/src/main.c
+++ b/src/main.c
@@ -937,9 +937,12 @@ prline (char const *beg, char const *lim, int sep)
       if (matching && (only_matching || *match_color))
         beg = print_line_middle (beg, lim, line_color, match_color);
 
-      /* FIXME: this test may be removable.  */
       if (!only_matching && *line_color)
-        beg = print_line_tail (beg, lim, line_color);
+        {
+          /* This code is exercised at least when grep is invoked like this:
+             echo k| GREP_COLORS='sl=01;32' src/grep k --color=always  */
+          beg = print_line_tail (beg, lim, line_color);
+        }
     }
 
   if (!only_matching && lim > beg)

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

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


hooks/post-receive
-- 
grep