From 374aa37ece5d67d003da358e35f0326da3cd2397 Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Wed, 28 Sep 2011 10:47:08 -0700 Subject: etc-update: support PAGER env var for bug #384663 --- cnf/etc-update.conf | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'cnf') diff --git a/cnf/etc-update.conf b/cnf/etc-update.conf index cea21739e..970986251 100644 --- a/cnf/etc-update.conf +++ b/cnf/etc-update.conf @@ -21,9 +21,9 @@ mv_opts="-i" # arguments used whenever cp is called cp_opts="-i" -# pager for use with diff commands -pager="less" -#pager="" +# set the pager for use with diff commands (this will +# cause the PAGER environment variable to be ignored) +#pager="less" # For emacs-users (see NOTE_2) # diff_command="eval emacs -nw --eval=\'\(ediff\ \"%file1\"\ \"%file2\"\)\'" @@ -47,9 +47,9 @@ merge_command="sdiff -s -o %merged %orig %new" # pager: # # Examples of pager usage: -# pager="" # don't use a pager -# pager="less -E" # less -# pager="more" # more +# pager="cat" # don't use a pager +# pager="less -E" # less +# pager="more" # more # # # diff_command: -- cgit v1.2.3-1-g7c22