moreproc is now Pager/defaultpager; removed -moreproc flags; added env vars.

[mmh] / uip / mhl.c

diff --git a/uip/mhl.c b/uip/mhl.c
index 3d8ad8d..38926b6 100644 (file)
--- a/uip/mhl.c
+++ b/uip/mhl.c
@@ -45,27 +45,25 @@ static struct swit mhlswitches[] = {
        { "folder +folder", 0 },
 #define FORMSW  1
        { "form formfile", 0 },
-#define PROGSW  2
-       { "moreproc program", 0 },
-#define WIDTHSW  3
+#define WIDTHSW  2
        { "width columns", 0 },
-#define SLEEPSW  4
+#define SLEEPSW  3
        { "sleep seconds",  0 },
-#define VERSIONSW  5
+#define VERSIONSW  4
        { "version", 0 },
-#define HELPSW  6
+#define HELPSW  5
        { "help", 0 },
-#define FORW1SW  7
+#define FORW1SW  6
        { "forward", -7 },
-#define FORW2SW  8
+#define FORW2SW  7
        { "forwall", -7 },
-#define DGSTSW  9
+#define DGSTSW  8
        { "digest list", -6 },
-#define VOLUMSW  10
+#define VOLUMSW  9
        { "volume number", -6 },
-#define ISSUESW  11
+#define ISSUESW  10
        { "issue number", -5 },
-#define NBODYSW  12
+#define NBODYSW  11
        { "nobody", -6 },
        { NULL, 0 }
 };
@@ -252,7 +250,6 @@ main(int argc, char **argv)
        char *cp, *folder = NULL, *form = NULL;
        char buf[BUFSIZ], *files[MAXARGS];
        char **argp, **arguments;
-       char *progsw = NULL;
 
 #ifdef LOCALE
        setlocale(LC_ALL, "");
@@ -304,12 +301,6 @@ main(int argc, char **argv)
                                sleepsw = atoi(cp);  /* ZERO ok! */
                                continue;
 
-                       case PROGSW:
-                               if (!(progsw = *argp++) || *progsw == '-')
-                                       adios(NULL, "missing argument to %s",
-                                                       argp[-2]);
-                               continue;
-
                        case WIDTHSW:
                                if (!(cp = *argp++) || *cp == '-')
                                        adios(NULL, "missing argument to %s",
@@ -365,7 +356,7 @@ main(int argc, char **argv)
                        SIGNAL2(SIGQUIT, quitser);
                }
                SIGNAL2(SIGPIPE, pipeser);
-               m_popen(progsw ? progsw : moreproc);
+               m_popen(defaultpager);
                ontty = PITTY;
        } else {
                ontty = NOTTY;