diff options
-rw-r--r-- | doc/quilt.1.in | 2 | ||||
-rw-r--r-- | quilt.changes | 7 | ||||
-rw-r--r-- | quilt/scripts/patchfns.in | 4 |
3 files changed, 10 insertions, 3 deletions
diff --git a/doc/quilt.1.in b/doc/quilt.1.in index eb2e8d1..895c518 100644 --- a/doc/quilt.1.in +++ b/doc/quilt.1.in @@ -208,7 +208,7 @@ QUILT_REFRESH_ARGS. The pager quilt shall use for commands which produce paginated output. If unset, the values of GIT_PAGER or PAGER is used. If none of these variables -is set, "less" is used. An empty value indicates that no pager should be +is set, "less -R" is used. An empty value indicates that no pager should be used. .IP EDITOR 4 diff --git a/quilt.changes b/quilt.changes index 1ca87b1..7843464 100644 --- a/quilt.changes +++ b/quilt.changes @@ -1,3 +1,10 @@ +Thu Dec 27 16:34:38 CET 2012 - mquinson@debian.org + +- Use 'less -R' as a default pager to help the users forcing diff to + produce colors. + (Closes https://bugs.launchpad.net/ubuntu/+source/quilt/+bug/933617) + +------------------------------------------------------------------- Thu Dec 27 14:26:31 CET 2012 - mquinson@debian.org - Document how quilt searches for its 'patches' directory in man page diff --git a/quilt/scripts/patchfns.in b/quilt/scripts/patchfns.in index 597ba8a..c696d8f 100644 --- a/quilt/scripts/patchfns.in +++ b/quilt/scripts/patchfns.in @@ -1002,9 +1002,9 @@ setup_pager() { test -t 1 || return 0 - # QUILT_PAGER = QUILT_PAGER | GIT_PAGER | PAGER | less + # QUILT_PAGER = QUILT_PAGER | GIT_PAGER | PAGER | less -R # NOTE: QUILT_PAGER='' is significant - QUILT_PAGER=${QUILT_PAGER-${GIT_PAGER-${PAGER-less}}} + QUILT_PAGER=${QUILT_PAGER-${GIT_PAGER-${PAGER-less -R}}} [ -z "$QUILT_PAGER" -o "$QUILT_PAGER" = "cat" ] && return 0 |