[PATCH] Note that context lines are not available with --only-matching

[Julian Foad]

How's this?

- Julian

Index: ChangeLog
===================================================================
RCS file: /cvsroot/grep/grep/ChangeLog,v
retrieving revision 1.279
diff -u -3 -p -d -r1.279 ChangeLog
--- ChangeLog   10 Nov 2005 01:19:02 -0000      1.279
+++ ChangeLog   10 Nov 2005 17:23:42 -0000
@@ -1,3 +1,8 @@
+2005-11-10  Julian Foad  <address@hidden>
+
+       * doc/grep.1, doc/grep.texi: Note that context lines are not available
+         with --only-matching.
+
 2005-11-10  Charles Levert  <address@hidden>
 
        * src/grep.c (main): Fix a subtle memory allocation bug introduced
Index: doc/grep.1
===================================================================
RCS file: /cvsroot/grep/grep/doc/grep.1,v
retrieving revision 1.36
diff -u -3 -p -d -r1.36 grep.1
--- doc/grep.1  9 Nov 2005 20:04:41 -0000       1.36
+++ doc/grep.1  10 Nov 2005 17:23:42 -0000
@@ -73,6 +73,9 @@ lines of trailing context after matching
 Places a line containing
 .B \-\^\-
 between contiguous groups of matches.
+With the
+.BR \-o ", " \-\^\-only-matching
+option, this has no effect and a warning is given.
 .TP
 .BR \-a ", " \-\^\-text
 Process a binary file as if it were text; this is equivalent to the
@@ -86,6 +89,9 @@ lines of leading context before matching
 Places a line containing
 .B \-\^\-
 between contiguous groups of matches.
+With the
+.BR \-o ", " \-\^\-only-matching
+option, this has no effect and a warning is given.
 .TP
 .BI \-C " NUM" "\fR,\fP \-\^\-context=" NUM
 Print
@@ -94,6 +100,9 @@ lines of output context.
 Places a line containing
 .B \-\^\-
 between contiguous groups of matches.
+With the
+.BR \-o ", " \-\^\-only-matching
+option, this has no effect and a warning is given.
 .TP
 .BR \-b ", " \-\^\-byte-offset
 Print the byte offset within the input file before
Index: doc/grep.texi
===================================================================
RCS file: /cvsroot/grep/grep/doc/grep.texi,v
retrieving revision 1.59
diff -u -3 -p -d -r1.59 grep.texi
--- doc/grep.texi       9 Nov 2005 20:04:41 -0000       1.59
+++ doc/grep.texi       10 Nov 2005 17:23:43 -0000
@@ -247,6 +247,8 @@ Select only those matches that exactly m
 @cindex after context
 @cindex context lines, after match
 Print @var{num} lines of trailing context after matching lines.
+With the @samp{-o}, @samp{--only-matching} option, this has no effect and
+a warning is given.
 
 @item -B @var{num}
 @itemx address@hidden
@@ -255,6 +257,8 @@ Print @var{num} lines of trailing contex
 @cindex before context
 @cindex context lines, before match
 Print @var{num} lines of leading context before matching lines.
+With the @samp{-o}, @samp{--only-matching} option, this has no effect and
+a warning is given.
 
 @item -C @var{num}
 @itemx address@hidden
@@ -262,6 +266,8 @@ Print @var{num} lines of leading context
 @opindex --context
 @cindex context
 Print @var{num} lines of output context.
+With the @samp{-o}, @samp{--only-matching} option, this has no effect and
+a warning is given.
 
 @item address@hidden
 @itemx address@hidden