Merge branch 'lt/diff' into next

diff --git a/pager.c b/pager.c
index e5ba2738b681387495b840d39dfeca920c865616..9a30939016620072f319b5fef81d0c913513a641 100644 (file)
--- a/pager.c
+++ b/pager.c
@@ -8,6 +8,7 @@
 static void run_pager(const char *pager)
 {
        execlp(pager, pager, NULL);
+       execl("/bin/sh", "sh", "-c", pager, NULL);
 }
 
 void setup_pager(void)
@@ -20,7 +21,7 @@ void setup_pager(void)
                return;
        if (!pager)
                pager = "less";
-       else if (!*pager)
+       else if (!*pager || !strcmp(pager, "cat"))
                return;
 
        if (pipe(fd) < 0)
@@ -47,5 +48,6 @@ void setup_pager(void)
 
        setenv("LESS", "-S", 0);
        run_pager(pager);
+       die("unable to execute pager '%s'", pager);
        exit(255);
 }