From: markus schnalke <meillo@marmaro.de>
Date: Thu, 9 Feb 2012 15:51:27 +0000 (+0100)
Subject: repl: Changed the meaning of -mime: It's now orthogonal to -format/-filter.
X-Git-Tag: mmh-thesis-end~337
X-Git-Url: http://git.marmaro.de/?a=commitdiff_plain;h=0ddc6c965ef307ff93f4fa642949d3130a700f9d;p=mmh

repl: Changed the meaning of -mime: It's now orthogonal to -format/-filter.
See changes in man page repl(1) for explanations.
---

diff --git a/man/repl.man1 b/man/repl.man1
index c3178bb..08b6b6b 100644
--- a/man/repl.man1
+++ b/man/repl.man1
@@ -273,14 +273,16 @@ This message filter file cites the Message-ID and author of the message
 being replied\-to, and then outputs each line of the body prefaced with
 the \*(lq>\*(rq character.
 .PP
-To use the MIME rules for encapsulation, specify the
+To MIME-attach the original message, specify the
 .B \-mime
 switch.
-This directs
-.B repl
-to add an attachment header field, for which
-.B send
-will care.
+Note: This decision is now unrelated to the \-format and \-filter options.
+It's meaning changed in the transition from nmh to mmh.
+Now it is possible to have the original message quoted in the body
+.B and
+attached as MIME part.
+However, using the \-mime switch is discouraged.
+It may get removed in the future.
 .PP
 If the
 .B \-annotate
diff --git a/uip/repl.c b/uip/repl.c
index a36b2c7..299185d 100644
--- a/uip/repl.c
+++ b/uip/repl.c
@@ -248,7 +248,6 @@ main(int argc, char **argv)
 					adios(NULL, "missing argument to %s",
 							argp[-2]);
 				filter = getcpy(etcpath(cp));
-				mime = 0;
 				continue;
 			case FORMSW:
 				if (!(form = *argp++) || *form == '-')
@@ -258,7 +257,6 @@ main(int argc, char **argv)
 
 			case FRMTSW:
 				filter = getcpy(etcpath(mhlreply));
-				mime = 0;
 				continue;
 			case NFRMTSW:
 				filter = NULL;
@@ -266,7 +264,6 @@ main(int argc, char **argv)
 
 			case MIMESW:
 				mime++;
-				filter = NULL;
 				continue;
 			case NMIMESW:
 				mime = 0;
@@ -596,8 +593,8 @@ finished:
 		adios(drft, "error writing");
 	fclose(out);
 
-	/* if we want mime, then add an attachment header */
-	if (!filter && mime && mp) {
+	if (mime && mp) {
+		/* add an attachment header */
 		char buffer[BUFSIZ];
 
 		snprintf(buffer, sizeof buffer, "+%s %s",