Annotations will always be done inplace from now on.

[mmh] / uip / whatnow.c

diff --git a/uip/whatnow.c b/uip/whatnow.c
index 7033cdf..5b59c86 100644 (file)
--- a/uip/whatnow.c
+++ b/uip/whatnow.c
@@ -74,7 +74,7 @@ static struct swit aleqs[] = {
 #define PUSHSW  5
        { "push [<switches>]", 0 },
 #define QUITSW  6
-       { "quit [-delete]", 0 },
+       { "quit", 0 },
 #define DELETESW  7
        { "delete", 0 },
 #define CDCMDSW  8
@@ -217,10 +217,7 @@ main(int argc, char **argv)
                }
                switch (smatch(*argp, aleqs)) {
                case DISPSW:
-                       /*
-                       ** display the message being replied to,
-                       ** or distributed
-                       */
+                       /* display the msg being replied to or distributed */
                        if (msgnam)
                                showfile(++argp, msgnam);
                        else
@@ -242,13 +239,9 @@ main(int argc, char **argv)
                        break;
 
                case QUITSW:
-                       /* Quit, and possibly delete the draft */
-                       if (*++argp && (*argp[0] == 'd' ||
-                               ((*argp)[0] == '-' && (*argp)[1] == 'd'))) {
-                               removefile(drft);
-                       } else {
-                               if (stat(drft, &st) != NOTOK)
-                                       advise(NULL, "draft left on %s", drft);
+                       /* quit */
+                       if (stat(drft, &st) != NOTOK) {
+                               advise(NULL, "draft left on %s", drft);
                        }
                        done(1);
 
@@ -390,13 +383,13 @@ main(int argc, char **argv)
 
                                        if (*shell == '/')
                                                annotate(drft, attach_hdr,
-                                                               shell, 1, 0,
+                                                               shell, 0,
                                                                -2, 1);
                                        else {
                                                sprintf(file, "%s/%s", cwd,
                                                                shell);
                                                annotate(drft, attach_hdr,
-                                                               file, 1, 0,
+                                                               file, 0,
                                                                -2, 1);
                                        }
                                }
@@ -444,7 +437,7 @@ main(int argc, char **argv)
                                        if (**arguments != '\0') {
                                                n = atoi(*arguments);
                                                annotate(drft, attach_hdr,
-                                                               NULL, 1, 0,
+                                                               NULL, 0,
                                                                n, 1);
 
                                                for (argp = arguments + 1; *argp != NULL; argp++) {
@@ -477,7 +470,7 @@ main(int argc, char **argv)
                                                != NULL) {
                                        *(strchr(shell, '\n')) = '\0';
                                        annotate(drft, attach_hdr, shell,
-                                                       1, 0, 0, 1);
+                                                       0, 0, 1);
                                }
                                pclose(f);
                        } else {