From 58160ee7bcee7dcc7dbf8e2d5377009e48bcf40b Mon Sep 17 00:00:00 2001
From: markus schnalke <meillo@marmaro.de>
Date: Mon, 30 Jan 2012 14:27:19 +0100
Subject: [PATCH] Removed the, in 1997 deprecated, send option -noshowproc and
 env var NOMHNPROC.

---
 docs/COMPLETION-ZSH |    2 +-
 man/show.man1       |   17 --------------
 uip/show.c          |   65 +++++++++++++++++++++------------------------------
 3 files changed, 28 insertions(+), 56 deletions(-)

diff --git a/docs/COMPLETION-ZSH b/docs/COMPLETION-ZSH
index ae1e71f..b5aeb25 100644
--- a/docs/COMPLETION-ZSH
+++ b/docs/COMPLETION-ZSH
@@ -154,7 +154,7 @@ compctl -K mhfseq -x 's[+][@]' -K mhcomp -S / -q - \
 
 compctl -K mhfseq -x 's[+][@]'  -K mhcomp -S / -q - \
   's[-]' -k "(draft form moreproc nomoreproc header noheader \
-   showproc noshowproc length width help)" - 'C[-1,-(show|more)proc]' -c - \
+   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/show.man1 b/man/show.man1
index 3310d2f..8f798cb 100644
--- a/man/show.man1
+++ b/man/show.man1
@@ -117,23 +117,6 @@ to use
 .IR showproc ,
 regardless of whether
 any of the messages are non-text (MIME) messages.
-.P
-The
-.B \-noshowproc
-switch will disable any formatting or paging of
-messages.  It is equivalent to
-.B \-nocheckmime
-.B \-showproc
-.IR cat .
-It is still accepted, but should be considered (somewhat) obsolete.
-.PP
-If the environment variable
-.B $NOMHNPROC
-is set, the test for
-non-text (MIME) messages will be disabled.  This method is obsolete.
-Use the
-.B \-nocheckmime
-switch instead.
 .PP
 The
 .B \-header
diff --git a/uip/show.c b/uip/show.c
index e7ecb72..38bb4b5 100644
--- a/uip/show.c
+++ b/uip/show.c
@@ -33,13 +33,11 @@ static struct swit switches[] = {
 	{ "showproc program", 0 },
 #define SHOWMIMESW  10
 	{ "showmimeproc program", 0 },
-#define NSHOWSW  11
-	{ "noshowproc", 0 },
-#define FILESW  12
+#define FILESW  11
 	{ "file file", -4 },  /* interface from showfile */
-#define VERSIONSW  13
+#define VERSIONSW  12
 	{ "version", 0 },
-#define HELPSW  14
+#define HELPSW  13
 	{ "help", 0 },
 	{ NULL, 0 }
 };
@@ -61,7 +59,7 @@ int
 main(int argc, char **argv)
 {
 	int headersw = 1, msgp = 0;
-	int nshow = 0, checkmime = 1, mime;
+	int checkmime = 1, mime;
 	int vecp = 1, procp = 1, mode = SHOW, msgnum;
 	char *cp, *maildir, *file = NULL, *folder = NULL, *proc;
 	char buf[BUFSIZ], **argp, **arguments;
@@ -144,10 +142,6 @@ usage:
 				if (!(showproc = *argp++) || *showproc == '-')
 					adios(NULL, "missing argument to %s",
 							argp[-2]);
-				nshow = 0;
-				continue;
-			case NSHOWSW:
-				nshow++;
 				continue;
 
 			case SHOWMIMESW:
@@ -155,7 +149,6 @@ usage:
 						*showmimeproc == '-')
 					adios(NULL, "missing argument to %s",
 							argp[-2]);
-				nshow = 0;
 				continue;
 			case CHECKMIMESW:
 				checkmime++;
@@ -264,37 +257,33 @@ go_to_it: ;
 	** Decide which "proc" to use
 	*/
 	mime = 0;
-	if (nshow) {
-		proc = catproc;
-	} else {
-		/* check if any messages are non-text MIME messages */
-		if (checkmime && !getenv("NOMHNPROC")) {
-			if (!file) {
-				/*
-				** loop through selected messages
-				** and check for MIME
-				*/
-				for (msgnum = mp->lowsel;
-						msgnum <= mp->hghsel;
-						msgnum++)
-					if (is_selected(mp, msgnum) && is_nontext(m_name(msgnum))) {
-						mime = 1;
-						break;
-					}
-			} else {
-				/* check the file for MIME */
-				if (is_nontext(vec[vecp - 1]))
+	/* check if any messages are non-text MIME messages */
+	if (checkmime) {
+		if (!file) {
+			/*
+			** loop through selected messages
+			** and check for MIME
+			*/
+			for (msgnum = mp->lowsel;
+					msgnum <= mp->hghsel;
+					msgnum++)
+				if (is_selected(mp, msgnum) && is_nontext(m_name(msgnum))) {
 					mime = 1;
-			}
+					break;
+				}
+		} else {
+			/* check the file for MIME */
+			if (is_nontext(vec[vecp - 1]))
+				mime = 1;
 		}
-
-		/* Set the "proc" */
-		if (mime)
-			proc = showmimeproc;
-		else
-			proc = showproc;
 	}
 
+	/* Set the "proc" */
+	if (mime)
+		proc = showmimeproc;
+	else
+		proc = showproc;
+
 	if (folder && !file)
 		m_putenv("mhfolder", folder);
 
-- 
1.7.10.4