grep branch, master, updated. v3.7-81-g2ff819e

[Paul Eggert]

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  2ff819e75099217912d5dec3020c7ede701bb21e (commit)
      from  d85711f6945f79443bbb51b4d0f668a91a163e50 (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=2ff819e75099217912d5dec3020c7ede701bb21e


commit 2ff819e75099217912d5dec3020c7ede701bb21e
Author: Paul Eggert <eggert@cs.ucla.edu>
Date:   Sun May 29 17:02:03 2022 -0700

    grep: document --color[=WHEN] more carefully

diff --git a/doc/grep.texi b/doc/grep.texi
index e2a8b2e..c34a1ae 100644
--- a/doc/grep.texi
+++ b/doc/grep.texi
@@ -300,7 +300,7 @@ count non-matching lines.
 @opindex --color
 @opindex --colour
 @cindex highlight, color, colour
-Surround the matched (non-empty) strings, matching lines, context lines,
+Surround matched non-empty strings, matching lines, context lines,
 file names, line numbers, byte offsets, and separators (for fields and
 groups of context lines) with escape sequences to display them in color
 on the terminal.
@@ -308,7 +308,14 @@ The colors are defined by the environment variable 
@env{GREP_COLORS}
 and default to @samp{ms=01;31:mc=01;31:sl=:cx=:fn=35:ln=32:bn=32:se=36}
 for bold red matched text, magenta file names, green line numbers,
 green byte offsets, cyan separators, and default terminal colors otherwise.
-@var{WHEN} is @samp{never}, @samp{always}, or @samp{auto}.
+@xref{Environment Variables}.
+
+@var{WHEN} is @samp{always} to use colors, @samp{never} to not use
+colors, or @samp{auto} to use colors if standard output is associated
+with a terminal device and the @env{TERM} environment variable's value
+suggests that the terminal supports colors.
+Plain @option{--color} is treated like @option{--color=auto};
+if no @option{--color} option is given, the default is @option{--color=never}.
 
 @item -L
 @itemx --files-without-match
@@ -380,7 +387,7 @@ When the @option{-v} or @option{--invert-match} option is 
also used,
 @opindex -o
 @opindex --only-matching
 @cindex only matching
-Print only the matched (non-empty) parts of matching lines,
+Print only the matched non-empty parts of matching lines,
 with each such part on a separate output line.
 Output lines use the same delimiters as input, and delimiters are null
 bytes if @option{-z} (@option{--null-data}) is also used (@pxref{Other
@@ -867,7 +874,7 @@ refer to terminal ``capabilities,'' the ability
 of a terminal to highlight text, or change its color, and so on.
 These capabilities are stored in an online database and accessed by
 the @code{terminfo} library.
-Nonempty capability values
+Non-empty capability values
 control highlighting using
 Select Graphic Rendition (SGR)
 commands interpreted by the terminal or terminal emulator.
@@ -1049,6 +1056,11 @@ by default,
 such options are permuted to the front of the operand list
 and are treated as options.
 
+@item TERM
+@vindex TERM @r{environment variable}
+This variable specifies the output terminal type, which can affect
+what the @option{--color} option does.  @xref{General Output Control}.
+
 @item _@var{N}_GNU_nonoption_argv_flags_
 @vindex _@var{N}_GNU_nonoption_argv_flags_ @r{environment variable}
 (Here @code{@var{N}} is @command{grep}'s numeric process ID.)

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

Summary of changes:
 doc/grep.texi | 20 ++++++++++++++++----
 1 file changed, 16 insertions(+), 4 deletions(-)


hooks/post-receive
-- 
grep