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

[mmh] / uip / mhshow.c

diff --git a/uip/mhshow.c b/uip/mhshow.c
index bf5ef8b..bbd99ea 100644 (file)
--- a/uip/mhshow.c
+++ b/uip/mhshow.c
@@ -51,23 +51,10 @@ static struct swit switches[] = {
        { "version", 0 },
 #define HELPSW  13
        { "help", 0 },
-
-/*
-** switches for moreproc/mhlproc
-*/
-#define PROGSW  16
-       { "moreproc program", -4 },
-#define NPROGSW  17
-       { "nomoreproc", -3 },
-#define LENSW  18
-       { "length lines", -4 },
-#define WIDTHSW  19
-       { "width columns", -4 },
-
 /*
 ** switches for debugging
 */
-#define DEBUGSW  20
+#define DEBUGSW  14
        { "debug", -5 },
        { NULL, 0 }
 };
@@ -84,9 +71,7 @@ extern char *cache_private;
 
 /* mhshowsbr.c */
 extern int serialsw;
-extern char *progsw;
 extern int nolist;
-extern int nomore;  /* flags for moreproc/header display */
 extern char *formsw;
 
 /* mhmisc.c */
@@ -237,25 +222,6 @@ do_cache:
                                formsw = getcpy(etcpath(cp));
                                continue;
 
-                       /*
-                       ** Switches for moreproc/mhlproc
-                       */
-                       case PROGSW:
-                               if (!(progsw = *argp++) || *progsw == '-')
-                                       adios(NULL, "missing argument to %s",
-                                                       argp[-2]);
-                               continue;
-                       case NPROGSW:
-                               nomore++;
-                               continue;
-
-                       case LENSW:
-                       case WIDTHSW:
-                               if (!(cp = *argp++) || *cp == '-')
-                                       adios(NULL, "missing argument to %s",
-                                                       argp[-2]);
-                               continue;
-
                        case VERBSW:
                                verbosw = 1;
                                continue;