X-Git-Url: http://git.marmaro.de/?a=blobdiff_plain;f=uip%2Fdist.c;h=52e480eecaa963509ea51f20fced8dee78feadda;hb=2d48b455c303a807041c35e4248955f8bec59eeb;hp=9ecfea17e0e5246c1a8658e7330204babae086ef;hpb=5b792c4424571f05bc2008e3109797d18d7d00d1;p=mmh

diff --git a/uip/dist.c b/uip/dist.c
index 9ecfea1..52e480e 100644
--- a/uip/dist.c
+++ b/uip/dist.c
@@ -21,19 +21,15 @@ static struct swit switches[] = {
 	{ "noedit", 0 },
 #define FORMSW  4
 	{ "form formfile", 0 },
-#define INPLSW  5
-	{ "inplace", 0 },
-#define NINPLSW  6
-	{ "noinplace", 0 },
-#define WHATSW  7
+#define WHATSW  5
 	{ "whatnowproc program", 0 },
-#define NWHATSW  8
+#define NWHATSW  6
 	{ "nowhatnowproc", 0 },
-#define VERSIONSW  9
+#define VERSIONSW  7
 	{ "version", 0 },
-#define HELPSW  10
+#define HELPSW  8
 	{ "help", 0 },
-#define FILESW  11
+#define FILESW  9
 	{ "file file", -4 },  /* interface from msh */
 	{ NULL, 0 }
 };
@@ -42,7 +38,7 @@ static struct swit switches[] = {
 int
 main(int argc, char **argv)
 {
-	int anot = 0, inplace = 1, nedit = 0;
+	int anot = 0, nedit = 0;
 	int nwhat = 0, in, out;
 	char *cp, *cwd, *maildir, *msgnam;
 	char *ed = NULL, *file = NULL, *folder = NULL;
@@ -118,13 +114,6 @@ main(int argc, char **argv)
 					adios(NULL, "missing argument to %s",
 							argp[-2]);
 				continue;
-
-			case INPLSW:
-				inplace++;
-				continue;
-			case NINPLSW:
-				inplace = 0;
-				continue;
 			}
 		}
 		if (*cp == '+' || *cp == '@') {
@@ -147,7 +136,7 @@ main(int argc, char **argv)
 
 	in = open_form(&form, distcomps);
 
-	strncpy(drft, m_draft("new"), sizeof(drft));
+	strncpy(drft, m_draft(seq_beyond), sizeof(drft));
 
 	if ((out = creat(drft, m_gmprot())) == NOTOK)
 		adios(drft, "unable to create");
@@ -166,7 +155,7 @@ main(int argc, char **argv)
 		** Dist a message
 		*/
 		if (!msg)
-			msg = "cur";
+			msg = seq_cur;
 		if (!folder)
 			folder = getcurfol();
 		maildir = toabsdir(folder);
@@ -205,7 +194,7 @@ main(int argc, char **argv)
 	if (nwhat)
 		done(0);
 	what_now(ed, nedit, NOUSE, drft, msgnam, 1, mp, anot ? "Resent" : NULL,
-			inplace, cwd);
+			cwd);
 	done(1);
 	return 1;
 }