am -i, git-svn: use "git var GIT_PAGER"

diff --git a/pager.c b/pager.c
index f416d38ac26042d7ed6dbf87f21bf5339e481a2e..0b63d99fe770153bdfcc99d23ef45befc14d45b0 100644 (file)
--- a/pager.c
+++ b/pager.c
@@ -9,7 +9,7 @@
 
 static int spawned_pager;
 
-#ifndef __MINGW32__
+#ifndef WIN32
 static void pager_preexec(void)
 {
        /*
@@ -44,12 +44,14 @@ static void wait_for_pager_signal(int signo)
        raise(signo);
 }
 
-void setup_pager(void)
+const char *git_pager(void)
 {
-       const char *pager = getenv("GIT_PAGER");
+       const char *pager;
 
        if (!isatty(1))
-               return;
+               return NULL;
+
+       pager = getenv("GIT_PAGER");
        if (!pager) {
                if (!pager_program)
                        git_config(git_default_config, NULL);
@@ -60,6 +62,16 @@ void setup_pager(void)
        if (!pager)
                pager = "less";
        else if (!*pager || !strcmp(pager, "cat"))
+               pager = NULL;
+
+       return pager;
+}
+
+void setup_pager(void)
+{
+       const char *pager = git_pager();
+
+       if (!pager)
                return;
 
        spawned_pager = 1; /* means we are emitting to terminal */
@@ -72,7 +84,7 @@ void setup_pager(void)
                static const char *env[] = { "LESS=FRSX", NULL };
                pager_process.env = env;
        }
-#ifndef __MINGW32__
+#ifndef WIN32
        pager_process.preexec_cb = pager_preexec;
 #endif
        if (start_command(&pager_process))