X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;ds=sidebyside;f=pager.c;h=4587fbbdb51e50c1e3e6e4c3476cdccd4ac59cee;hb=91c23e48d0666a673dd14760bb00f6d59234d9d9;hp=280f57f796c84d1c1fd54e295b542c3b33490b3e;hpb=3939b805f4147a97c08cc50ef7e53cd6c2490c5c;p=git.git

diff --git a/pager.c b/pager.c
index 280f57f79..4587fbbdb 100644
--- a/pager.c
+++ b/pager.c
@@ -15,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"))
@@ -48,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);