X-Git-Url: http://git.marmaro.de/?a=blobdiff_plain;f=uip%2Fwhatnow.c;h=761fea1db83cbf619adf86d696d8062d67d1ab43;hb=33b33a0ac8a3f8f05c9bb0195c100306c00cce35;hp=b0819003dd6ae7faf2ce65534c2e28a9c163dc59;hpb=d297b2240c664de09b6d51a07a071aab33c4bf32;p=mmh

diff --git a/uip/whatnow.c b/uip/whatnow.c
index b081900..761fea1 100644
--- a/uip/whatnow.c
+++ b/uip/whatnow.c
@@ -66,9 +66,9 @@ static struct swit aleqs[] = {
 #define REFILEOPT  1
 	{ "refile [<switches>] +folder", 0 },
 #define DISPSW  2
-	{ "display [<switches>]", 0 },
+	{ "display", 0 },
 #define LISTSW  3
-	{ "list [<switches>]", 0 },
+	{ "list", 0 },
 #define SENDSW  4
 	{ "send [<switches>]", 0 },
 #define PUSHSW  5
@@ -218,10 +218,13 @@ main(int argc, char **argv)
 		switch (smatch(*argp, aleqs)) {
 		case DISPSW:
 			/* display the msg being replied to or distributed */
-			if (msgnam)
-				showfile(++argp, msgnam);
-			else
+			if (msgnam) {
+				snprintf(buf, sizeof buf, "%s '%s'",
+						lproc, msgnam);
+				system(buf);
+			} else {
 				advise(NULL, "no alternate message to display");
+			}
 			break;
 
 		case EDITSW:
@@ -235,7 +238,8 @@ main(int argc, char **argv)
 
 		case LISTSW:
 			/* display the draft file */
-			showfile(++argp, drft);
+			snprintf(buf, sizeof buf, "%s '%s'", lproc, drft);
+			system(buf);
 			break;
 
 		case QUITSW:
@@ -383,14 +387,14 @@ main(int argc, char **argv)
 
 					if (*shell == '/')
 						annotate(drft, attach_hdr,
-								shell, 1, 0,
-								-2, 1);
+								shell, 0,
+								-2, 1, 0);
 					else {
 						sprintf(file, "%s/%s", cwd,
 								shell);
 						annotate(drft, attach_hdr,
-								file, 1, 0,
-								-2, 1);
+								file, 0,
+								-2, 1, 0);
 					}
 				}
 
@@ -437,8 +441,8 @@ main(int argc, char **argv)
 					if (**arguments != '\0') {
 						n = atoi(*arguments);
 						annotate(drft, attach_hdr,
-								NULL, 1, 0,
-								n, 1);
+								NULL, 0,
+								n, 1, 0);
 
 						for (argp = arguments + 1; *argp != NULL; argp++) {
 							if (atoi(*argp) > n) {
@@ -470,7 +474,7 @@ main(int argc, char **argv)
 						!= NULL) {
 					*(strchr(shell, '\n')) = '\0';
 					annotate(drft, attach_hdr, shell,
-							1, 0, 0, 1);
+							0, 0, 1, 0);
 				}
 				pclose(f);
 			} else {