Removed the -nomoreproc switch from mhl, show, mhshow.

We'll go for always having a moreproc after mhl. If you just want to cat out,
then use `-moreproc cat'. mhl's very basic paging facility will be removed.

diff --git a/docs/COMPLETION-ZSH b/docs/COMPLETION-ZSH
index da0b027..54be038 100644 (file)
--- a/docs/COMPLETION-ZSH
+++ b/docs/COMPLETION-ZSH
@@ -153,7 +153,7 @@ compctl -K mhfseq -x 's[+][@]' -K mhcomp -S / -q - \
   file help width)" - 'c[-1,-file]' -f - 'c[-1,-form]' -K mhfile -- scan
 
 compctl -K mhfseq -x 's[+][@]'  -K mhcomp -S / -q - \
   file help width)" - 'c[-1,-file]' -f - 'c[-1,-form]' -K mhfile -- scan
 
 compctl -K mhfseq -x 's[+][@]'  -K mhcomp -S / -q - \

-  's[-]' -k "(draft form moreproc nomoreproc header noheader \
+  's[-]' -k "(draft form moreproc header noheader \

    showproc length width help)" - 'C[-1,-(show|more)proc]' -c - \
    'c[-1,-file]' -f - 'c[-1,-form]' -K mhfile - \
    'c[-1,-length]' -s '$LINES' - 'c[-1,-width]' -s '$COLUMNS' -- show next prev
    showproc length width help)" - 'C[-1,-(show|more)proc]' -c - \
    'c[-1,-file]' -f - 'c[-1,-form]' -K mhfile - \
    'c[-1,-length]' -s '$LINES' - 'c[-1,-width]' -s '$COLUMNS' -- show next prev

diff --git a/man/mh-chart.man1 b/man/mh-chart.man1
index afb3fc1..c425bdc 100644 (file)
--- a/man/mh-chart.man1
+++ b/man/mh-chart.man1
@@ -266,7 +266,6 @@ is equivalent to
 .IR columns ]
 .RB [ \-moreproc
 .IR program ]
 .IR columns ]
 .RB [ \-moreproc
 .IR program ]

-.RB [ \-nomoreproc ]

 .RI [ files
 .IR \&... ]
 .RB [ \-version ]
 .RI [ files
 .IR \&... ]
 .RB [ \-version ]

diff --git a/man/mhl.man1 b/man/mhl.man1
index b910f4d..e453bab 100644 (file)
--- a/man/mhl.man1
+++ b/man/mhl.man1
@@ -20,7 +20,6 @@ mhl \- produce formatted listings of nmh messages
 .IR columns ]
 .RB [ \-moreproc
 .IR program ]
 .IR columns ]
 .RB [ \-moreproc
 .IR program ]

-.RB [ \-nomoreproc ]

 .RI [ files
 .IR \&... ]
 .RB [ \-version ]
 .RI [ files
 .IR \&... ]
 .RB [ \-version ]

diff --git a/uip/mhl.c b/uip/mhl.c
index d3b7429..017d2f7 100644 (file)
--- a/uip/mhl.c
+++ b/uip/mhl.c
@@ -55,29 +55,27 @@ static struct swit mhlswitches[] = {
        { "form formfile", 0 },
 #define PROGSW  6
        { "moreproc program", 0 },
        { "form formfile", 0 },
 #define PROGSW  6
        { "moreproc program", 0 },

-#define NPROGSW  7
-       { "nomoreproc", 0 },
-#define LENSW  8
+#define LENSW  7

        { "length lines", 0 },
        { "length lines", 0 },

-#define WIDTHSW  9
+#define WIDTHSW  8

        { "width columns", 0 },
        { "width columns", 0 },

-#define SLEEPSW  10
+#define SLEEPSW  9

        { "sleep seconds",  0 },
        { "sleep seconds",  0 },

-#define VERSIONSW  11
+#define VERSIONSW  10

        { "version", 0 },
        { "version", 0 },

-#define HELPSW  12
+#define HELPSW  11

        { "help", 0 },
        { "help", 0 },

-#define FORW1SW  13
+#define FORW1SW  12

        { "forward", -7 },
        { "forward", -7 },

-#define FORW2SW  14
+#define FORW2SW  13

        { "forwall", -7 },
        { "forwall", -7 },

-#define DGSTSW  15
+#define DGSTSW  14

        { "digest list", -6 },
        { "digest list", -6 },

-#define VOLUMSW  16
+#define VOLUMSW  15

        { "volume number", -6 },
        { "volume number", -6 },

-#define ISSUESW  17
+#define ISSUESW  16

        { "issue number", -5 },
        { "issue number", -5 },

-#define NBODYSW  18
+#define NBODYSW  17

        { "nobody", -6 },
        { NULL, 0 }
 };
        { "nobody", -6 },
        { NULL, 0 }
 };

@@ -277,7 +275,7 @@ int sc_hardcopy(void);  /* from termsbr.c */
 int
 main(int argc, char **argv)
 {
 int
 main(int argc, char **argv)
 {

-       int length = 0, nomore = 0;
+       int length = 0;

        int i, width = 0, vecp = 0;
        char *cp, *folder = NULL, *form = NULL;
        char buf[BUFSIZ], *files[MAXARGS];
        int i, width = 0, vecp = 0;
        char *cp, *folder = NULL, *form = NULL;
        char buf[BUFSIZ], *files[MAXARGS];

@@ -352,9 +350,6 @@ main(int argc, char **argv)
                                        adios(NULL, "missing argument to %s",
                                                        argp[-2]);
                                continue;
                                        adios(NULL, "missing argument to %s",
                                                        argp[-2]);
                                continue;

-                       case NPROGSW:
-                               nomore++;
-                               continue;

 
                        case LENSW:
                                if (!(cp = *argp++) || *cp == '-')
 
                        case LENSW:
                                if (!(cp = *argp++) || *cp == '-')

@@ -415,7 +410,7 @@ main(int argc, char **argv)
                folder = getenv("mhfolder");
 
        if (isatty(fileno(stdout))) {
                folder = getenv("mhfolder");
 
        if (isatty(fileno(stdout))) {

-               if (!nomore && !sc_hardcopy() && moreproc && *moreproc != '\0') {
+               if (!sc_hardcopy() && moreproc && *moreproc != '\0') {

                        if (mhl_action) {
                                SIGNAL(SIGINT, SIG_IGN);
                                SIGNAL2(SIGQUIT, quitser);
                        if (mhl_action) {
                                SIGNAL(SIGINT, SIG_IGN);
                                SIGNAL2(SIGQUIT, quitser);

diff --git a/uip/mhshow.c b/uip/mhshow.c
index bf5ef8b..0baf198 100644 (file)
--- a/uip/mhshow.c
+++ b/uip/mhshow.c
@@ -51,23 +51,19 @@ static struct swit switches[] = {
        { "version", 0 },
 #define HELPSW  13
        { "help", 0 },
        { "version", 0 },
 #define HELPSW  13
        { "help", 0 },

-

 /*
 ** switches for moreproc/mhlproc
 */
 /*
 ** switches for moreproc/mhlproc
 */

-#define PROGSW  16
+#define PROGSW  14

        { "moreproc program", -4 },
        { "moreproc program", -4 },

-#define NPROGSW  17
-       { "nomoreproc", -3 },
-#define LENSW  18
+#define LENSW  15

        { "length lines", -4 },
        { "length lines", -4 },

-#define WIDTHSW  19
+#define WIDTHSW  16

        { "width columns", -4 },
        { "width columns", -4 },

-

 /*
 ** switches for debugging
 */
 /*
 ** switches for debugging
 */

-#define DEBUGSW  20
+#define DEBUGSW  17

        { "debug", -5 },
        { NULL, 0 }
 };
        { "debug", -5 },
        { NULL, 0 }
 };

@@ -86,7 +82,6 @@ extern char *cache_private;
 extern int serialsw;
 extern char *progsw;
 extern int nolist;
 extern int serialsw;
 extern char *progsw;
 extern int nolist;

-extern int nomore;  /* flags for moreproc/header display */

 extern char *formsw;
 
 /* mhmisc.c */
 extern char *formsw;
 
 /* mhmisc.c */

@@ -245,9 +240,6 @@ do_cache:
                                        adios(NULL, "missing argument to %s",
                                                        argp[-2]);
                                continue;
                                        adios(NULL, "missing argument to %s",
                                                        argp[-2]);
                                continue;

-                       case NPROGSW:
-                               nomore++;
-                               continue;

 
                        case LENSW:
                        case WIDTHSW:
 
                        case LENSW:
                        case WIDTHSW:

diff --git a/uip/mhshowsbr.c b/uip/mhshowsbr.c
index e302d3b..e05dddf 100644 (file)
--- a/uip/mhshowsbr.c
+++ b/uip/mhshowsbr.c
@@ -40,7 +40,6 @@ int nolist   = 0;
 char *progsw = NULL;
 
 /* flags for moreproc/header display */
 char *progsw = NULL;
 
 /* flags for moreproc/header display */

-int nomore   = 0;

 char *formsw = NULL;
 
 pid_t xpid = 0;
 char *formsw = NULL;
 
 pid_t xpid = 0;

@@ -200,13 +199,8 @@ DisplayMsgHeader(CT ct, char *form)
        vec[vecp++] = "-nobody";
        vec[vecp++] = ct->c_file;
 
        vec[vecp++] = "-nobody";
        vec[vecp++] = ct->c_file;
 

-       /*
-       ** If we've specified -(no)moreproc,
-       ** then just pass that along.
-       */
-       if (nomore) {
-               vec[vecp++] = "-nomoreproc";
-       } else if (progsw) {
+       /* If we've specified -moreproc, then just pass that along. */
+       if (progsw) {

                vec[vecp++] = "-moreproc";
                vec[vecp++] = progsw;
        }
                vec[vecp++] = "-moreproc";
                vec[vecp++] = progsw;
        }

diff --git a/uip/show.c b/uip/show.c
index 6e4f316..89602ef 100644 (file)
--- a/uip/show.c
+++ b/uip/show.c
@@ -23,21 +23,19 @@ static struct swit switches[] = {
        { "form formfile", 0 },
 #define PROGSW  5
        { "moreproc program", 0 },
        { "form formfile", 0 },
 #define PROGSW  5
        { "moreproc program", 0 },

-#define NPROGSW  6
-       { "nomoreproc", 0 },
-#define LENSW  7
+#define LENSW  6

        { "length lines", 0 },
        { "length lines", 0 },

-#define WIDTHSW  8
+#define WIDTHSW  7

        { "width columns", 0 },
        { "width columns", 0 },

-#define SHOWSW  9
+#define SHOWSW  8

        { "showproc program", 0 },
        { "showproc program", 0 },

-#define SHOWMIMESW  10
+#define SHOWMIMESW  9

        { "showmimeproc program", 0 },
        { "showmimeproc program", 0 },

-#define FILESW  11
+#define FILESW  10

        { "file file", -4 },  /* interface from showfile */
        { "file file", -4 },  /* interface from showfile */

-#define VERSIONSW  12
+#define VERSIONSW  11

        { "version", 0 },
        { "version", 0 },

-#define HELPSW  13
+#define HELPSW  12

        { "help", 0 },
        { NULL, 0 }
 };
        { "help", 0 },
        { NULL, 0 }
 };

@@ -86,7 +84,6 @@ main(int argc, char **argv)
                                ambigsw(cp, switches);
                                done(1);
                        case UNKWNSW:
                                ambigsw(cp, switches);
                                done(1);
                        case UNKWNSW:

-                       case NPROGSW:

                                vec[vecp++] = --cp;
                                continue;
 
                                vec[vecp++] = --cp;
                                continue;