X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=pager.c;h=86facec7b417b26a7dbd9b3c1338149fcecd5588;hb=264b774ba6b27cc07ef4c33d52e491d9abf029bb;hp=4921843577e42b774457a61277b9bc3441d3ab6b;hpb=9d5156496d2d32800df52fa372295c16ab2578f0;p=git.git

diff --git a/pager.c b/pager.c
index 492184357..86facec7b 100644
--- a/pager.c
+++ b/pager.c
@@ -9,7 +9,7 @@
 
 static int spawned_pager;
 
-#ifndef __MINGW32__
+#ifndef WIN32
 static void pager_preexec(void)
 {
 	/*
@@ -21,8 +21,6 @@ static void pager_preexec(void)
 	FD_ZERO(&in);
 	FD_SET(0, &in);
 	select(1, &in, NULL, &in, NULL);
-
-	setenv("LESS", "FRSX", 0);
 }
 #endif
 
@@ -70,7 +68,11 @@ void setup_pager(void)
 	pager_argv[2] = pager;
 	pager_process.argv = pager_argv;
 	pager_process.in = -1;
-#ifndef __MINGW32__
+	if (!getenv("LESS")) {
+		static const char *env[] = { "LESS=FRSX", NULL };
+		pager_process.env = env;
+	}
+#ifndef WIN32
 	pager_process.preexec_cb = pager_preexec;
 #endif
 	if (start_command(&pager_process))