git-send-email: Read the default SMTP server from the GIT config file

diff --git a/pager.c b/pager.c
index bb14e99735dd08c31c66325eacdcde4f3f2c685c..4587fbbdb51e50c1e3e6e4c3476cdccd4ac59cee 100644 (file)
--- 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);