Merge branch 'maint'

diff --git a/pager.c b/pager.c
index 5f280ab52720772905cacbcba522ecc9c81bb529..3bfed025996bbdc31aebd4a7b096236c538a4e75 100644 (file)
--- a/pager.c
+++ b/pager.c
@@ -31,6 +31,8 @@ void setup_pager(void)
 
        if (!isatty(1))
                return;
+       if (!pager)
+               pager = pager_program;
        if (!pager)
                pager = getenv("PAGER");
        if (!pager)