X-Git-Url: http://git.marmaro.de/?p=mmh;a=blobdiff_plain;f=uip%2Fmhshowsbr.c;h=15991c18d580a638b991a7d28b0077b16031e889;hp=b7452d8a1b8cc3d39d714b8279d97511c6fc6f91;hb=cebc12618d19409a25e332eef13e825df15a9bc2;hpb=a4605f68e8ff04d4539e402a6fb00ff188944e1c

diff --git a/uip/mhshowsbr.c b/uip/mhshowsbr.c
index b7452d8..15991c1 100644
--- a/uip/mhshowsbr.c
+++ b/uip/mhshowsbr.c
@@ -13,7 +13,6 @@
 #include <errno.h>
 #include <setjmp.h>
 #include <signal.h>
-#include <h/mts.h>
 #include <h/tws.h>
 #include <h/mime.h>
 #include <h/mhparse.h>
@@ -41,15 +40,11 @@ int nolist   = 0;
 char *progsw = NULL;
 
 /* flags for moreproc/header display */
-int nomore   = 0;
 char *formsw = NULL;
 
 pid_t xpid = 0;
 
 
-/* termsbr.c */
-int SOprintf(char *, ...);
-
 /* mhparse.c */
 int pidcheck(int);
 
@@ -201,13 +196,8 @@ DisplayMsgHeader(CT ct, char *form)
 	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;
 	}
@@ -632,8 +622,7 @@ show_text(CT ct, int serial, int alternate)
 	*/
 	if (!alternate || ct->c_subtype == TEXT_PLAIN) {
 		snprintf(buffer, sizeof(buffer), "%%p%s '%%F'",
-				progsw ? progsw : moreproc && *moreproc ?
-				moreproc : "more");
+				progsw ? progsw : moreproc);
 		cp = (ct->c_showproc = getcpy(buffer));
 		return show_content_aux(ct, serial, alternate, cp, NULL);
 	}