X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=pager.c;h=4587fbbdb51e50c1e3e6e4c3476cdccd4ac59cee;hb=43853554542700e0d129ce853a3d4b16740035d4;hp=bb14e99735dd08c31c66325eacdcde4f3f2c685c;hpb=868227b0d1f3a295ea9afe7a3be3a1fbdff62442;p=git.git

diff --git a/pager.c b/pager.c
index bb14e9973..4587fbbdb 100644
--- a/pager.c
+++ b/pager.c
@@ -5,8 +5,6 @@
  * something different on Windows, for example.
  */
 
-int pager_in_use;
-
 static void run_pager(const char *pager)
 {
 	execlp(pager, pager, NULL);
@@ -17,10 +15,12 @@ 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"))
@@ -50,7 +50,7 @@ void setup_pager(void)
 	close(fd[0]);
 	close(fd[1]);
 
-	setenv("LESS", "-RS", 0);
+	setenv("LESS", "FRSX", 0);
 	run_pager(pager);
 	die("unable to execute pager '%s'", pager);
 	exit(255);