grep: remove GREP_OPTIONS

* NEWS: Mention this.
* doc/grep.in.1:
Remove GREP_OPTIONS documentation.
* doc/grep.texi (Environment Variables):
Move GREP_OPTIONS stuff into a “no longer implemented” paragraph.
* src/grep.c (prepend_args, prepend_default_options): Remove.
(main): Do not look at GREP_OPTIONS.
* tests/Makefile.am (TESTS_ENVIRONMENTS):
* tests/init.cfg (vars_): Remove GREP_OPTIONS.

2 files changed, 14 insertions, 29 deletions

diff --git a/doc/grep.in.1 b/doc/grep.in.1
index 7d5dfe5a..c56c4040 100644
--- a/doc/grep.in.1
+++ b/doc/grep.in.1
@@ -1001,17 +1001,6 @@ The shell command
 .B "locale \-a"
 lists locales that are currently available.
 .TP
-.B GREP_OPTIONS
-This variable specifies default options
-to be placed in front of any explicit options.
-As this causes problems when writing portable scripts,
-this feature will be removed in a future release of
-.BR grep ,
-and
-.B grep
-warns if it is used.
-Please use an alias or script instead.
-.TP
 .B GREP_COLOR
 This variable specifies the color used to highlight matched (non-empty) text.
 It is deprecated in favor of
diff --git a/doc/grep.texi b/doc/grep.texi
index 0c0bb124..fce36cdf 100644
--- a/doc/grep.texi
+++ b/doc/grep.texi
@@ -887,24 +887,6 @@ the @code{terminfo} library.
 
 @table @env
 
-@item GREP_OPTIONS
-@vindex GREP_OPTIONS @r{environment variable}
-@cindex default options environment variable
-This variable specifies default options to be placed in front of any
-explicit options.
-As this causes problems when writing portable scripts, this feature
-will be removed in a future release of @command{grep}, and @command{grep}
-warns if it is used.  Please use an alias or script instead.
-For example, if @command{grep} is in the directory @samp{/usr/bin} you
-can prepend @file{$HOME/bin} to your @env{PATH} and create an
-executable script @file{$HOME/bin/grep} containing the following:
-
-@example
-#! /bin/sh
-export PATH=/usr/bin
-exec grep --color=auto --devices=skip "$@@"
-@end example
-
 @item GREP_COLOR
 @vindex GREP_COLOR @r{environment variable}
 @cindex highlight markers
@@ -1097,6 +1079,20 @@ and only when @env{POSIXLY_CORRECT} is not set.
 
 @end table
 
+The @env{GREP_OPTIONS} environment variable of @command{grep} 2.20 and
+earlier is no longer supported, as it caused problems when writing
+portable scripts.  To make arbitrary changes to how @command{grep}
+works, you can use an alias or script instead.  For example, if
+@command{grep} is in the directory @samp{/usr/bin} you can prepend
+@file{$HOME/bin} to your @env{PATH} and create an executable script
+@file{$HOME/bin/grep} containing the following:
+
+@example
+#! /bin/sh
+export PATH=/usr/bin
+exec grep --color=auto --devices=skip "$@@"
+@end example
+
 
 @node Exit Status
 @section Exit Status