Removed the `-delete' option from the `quit' command at the whatnow prompt.

There already is a command `delete' that's equal to the removed `quit -delete'.

diff --git a/man/whatnow.man1 b/man/whatnow.man1
index 764234b..526c71a 100644 (file)
--- a/man/whatnow.man1
+++ b/man/whatnow.man1
@@ -70,9 +70,6 @@ send the message in the background
 .B quit
 preserve the draft and exit
 .TP \w'refilezzzzfolderz'u
 .B quit
 preserve the draft and exit
 .TP \w'refilezzzzfolderz'u

-.B quit \-delete
-delete the draft and exit
-.TP \w'refilezzzzfolderz'u

 .B delete
 delete the draft and exit
 .TP \w'refilezzzzfolderz'u
 .B delete
 delete the draft and exit
 .TP \w'refilezzzzfolderz'u

diff --git a/uip/whatnow.c b/uip/whatnow.c
index 7033cdf..b081900 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
 #define PUSHSW  5
        { "push [<switches>]", 0 },
 #define QUITSW  6

-       { "quit [-delete]", 0 },
+       { "quit", 0 },

 #define DELETESW  7
        { "delete", 0 },
 #define CDCMDSW  8
 #define DELETESW  7
        { "delete", 0 },
 #define CDCMDSW  8

@@ -217,10 +217,7 @@ main(int argc, char **argv)
                }
                switch (smatch(*argp, aleqs)) {
                case DISPSW:
                }
                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
                        if (msgnam)
                                showfile(++argp, msgnam);
                        else

@@ -242,13 +239,9 @@ main(int argc, char **argv)
                        break;
 
                case QUITSW:
                        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);
 
                        }
                        done(1);