[Quilt-dev] [PATCH] Document overriding LESS in ~/.quiltrc

[Kent R. Spillner]

Similar to EDITOR, document quilt's use of LESS when paging output.
QUILT_LESS_ARGS is unnecessary, so revert 
497979e561e880fb0d11be82c78544e5718d531b.

Signed-off-by: Kent R. Spillner <address@hidden>
---
 doc/quilt.1.in            | 12 ++++++------
 quilt/scripts/patchfns.in |  3 +--
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/doc/quilt.1.in b/doc/quilt.1.in
index 8ac5985..b2e2c34 100644
--- a/doc/quilt.1.in
+++ b/doc/quilt.1.in
@@ -161,6 +161,12 @@ In addition to that, quilt recognizes the following 
variables:
 The program to run to edit files.  If it isn't redefined in the
 configuration file, $EDITOR as defined in the environment will be used.
 
+.IP LESS 4
+
+The arguments used to invoke the pager.  Inherits the existing value
+of $LESS if LESS is already set in the environment, otherwise defaults
+to "-FRSX".
+
 .IP QUILT_DIFF_OPTS 4
 
 Additional options that quilt shall pass to GNU diff when generating
@@ -284,12 +290,6 @@ the following content to ~/.quiltrc (or 
/etc/quilt.quiltrc):
 .fi
 .RE 4
 
-.IP QUILT_LESS_ARGS 4
-
-The value quilt sets in the LESS environment variable before starting the
-pager regardless of which pager quilt is configured to use.  Defaults to
-the existing value of LESS, or "-FRSX" if LESS is undefined.
-
 .SH AUTHORS
 
 Quilt started as a series of scripts written by Andrew Morton
diff --git a/quilt/scripts/patchfns.in b/quilt/scripts/patchfns.in
index fb05794..325c012 100644
--- a/quilt/scripts/patchfns.in
+++ b/quilt/scripts/patchfns.in
@@ -1008,8 +1008,7 @@ setup_pager()
 
        [ -z "$QUILT_PAGER" -o "$QUILT_PAGER" = "cat" ]  && return 0
 
-       QUILT_LESS_ARGS="${QUILT_LESS_ARGS-${LESS:-FRSX}}"
-       export LESS="${QUILT_LESS_ARGS}"
+       exports LESS="${LESS:-FRSX}"
 
        # NOTE: with "exec > >($pager)" there is no way to get the pid of the
        # pager so we can't wait for it to complete.  Otherwise we wouldn't
-- 
1.8.5.1