diff options
| author | Andreas Gruenbacher <agruen@suse.de> | 2009-11-25 20:53:30 +0100 |
|---|---|---|
| committer | Andreas Gruenbacher <agruen@suse.de> | 2009-11-25 20:54:50 +0100 |
| commit | f214b718c74c5253b29a07b6507adb033e3435ce (patch) | |
| tree | 19c7aab5ddbc246ee0ef723a47fceb43ebb66dd2 | |
| parent | ae6cfa74e5517bfbc2588401ce5e6e1ffaba2f4c (diff) | |
| download | quilt-f214b718c74c5253b29a07b6507adb033e3435ce.tar.gz | |
- quilt.quiltrc: make sur eto only override QUILT_PAGER if
QUILT_PAGER isn't set already.
| -rw-r--r-- | quilt.changes | 6 | ||||
| -rw-r--r-- | quilt.quiltrc | 2 |
2 files changed, 7 insertions, 1 deletions
diff --git a/quilt.changes b/quilt.changes index 3421516..681996d 100644 --- a/quilt.changes +++ b/quilt.changes @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Wed Nov 25 20:52:52 CET 2009 - agruen@suse.de + +- quilt.quiltrc: make sur eto only override QUILT_PAGER if + QUILT_PAGER isn't set already. + +------------------------------------------------------------------- Wed Nov 25 20:30:39 CET 2009 - agruen@suse.de - inspect: Try to better recognize "patch -d" and "tar -C" (which diff --git a/quilt.quiltrc b/quilt.quiltrc index cd44500..ecc2ebf 100644 --- a/quilt.quiltrc +++ b/quilt.quiltrc @@ -20,7 +20,7 @@ QUILT_PATCHES_ARGS="--color=auto" # When non-default less options are used, add the -R option so that less outputs # ANSI color escape codes "raw". -[ -n "$LESS" ] && QUILT_PAGER="less -R" +[ -n "$LESS" -a -z "${QUILT_PAGER+x}" ] && QUILT_PAGER="less -R" # (Add "-p ab" to QUILT_DIFF_ARGS and QUILT_REFRESH_ARGS to get # -p1 style diffs with a/file and b/file filenams in headers |