- Issue #8637: Honor a pager set by the env var MANPAGER (in preference to

one set by the env var PAGER).
This commit is contained in:
doko@ubuntu.com 2016-06-14 09:03:52 +02:00
parent 5553231b91
commit c8fd1928d0
1 changed files with 3 additions and 3 deletions

View File

@ -1432,11 +1432,11 @@ def getpager():
use_pager = os.environ.get('MANPAGER') or os.environ.get('PAGER')
if use_pager:
if sys.platform == 'win32': # pipes completely broken in Windows
return lambda text: tempfilepager(plain(text), os.environ['PAGER'])
return lambda text: tempfilepager(plain(text), use_pager)
elif os.environ.get('TERM') in ('dumb', 'emacs'):
return lambda text: pipepager(plain(text), os.environ['PAGER'])
return lambda text: pipepager(plain(text), use_pager)
else:
return lambda text: pipepager(text, os.environ['PAGER'])
return lambda text: pipepager(text, use_pager)
if os.environ.get('TERM') in ('dumb', 'emacs'):
return plainpager
if sys.platform == 'win32':