X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=pager.c;h=4587fbbdb51e50c1e3e6e4c3476cdccd4ac59cee;hb=e52775f43857f377aa2aa69f82ac2d2f26dc6297;hp=9a30939016620072f319b5fef81d0c913513a641;hpb=de1d4fa2a1273e09c32653c7a21602e36223348c;p=git.git

diff --git a/pager.c b/pager.c
index 9a3093901..4587fbbdb 100644
--- a/pager.c
+++ b/pager.c
@@ -15,15 +15,19 @@ void setup_pager(void)
 {
 	pid_t pid;
 	int fd[2];
-	const char *pager = getenv("PAGER");
+	const char *pager = getenv("GIT_PAGER");
 
 	if (!isatty(1))
 		return;
+	if (!pager)
+		pager = getenv("PAGER");
 	if (!pager)
 		pager = "less";
 	else if (!*pager || !strcmp(pager, "cat"))
 		return;
 
+	pager_in_use = 1; /* means we are emitting to terminal */
+
 	if (pipe(fd) < 0)
 		return;
 	pid = fork();
@@ -46,7 +50,7 @@ void setup_pager(void)
 	close(fd[0]);
 	close(fd[1]);
 
-	setenv("LESS", "-S", 0);
+	setenv("LESS", "FRSX", 0);
 	run_pager(pager);
 	die("unable to execute pager '%s'", pager);
 	exit(255);