From d297b2240c664de09b6d51a07a071aab33c4bf32 Mon Sep 17 00:00:00 2001 From: markus schnalke Date: Wed, 8 Feb 2012 14:33:30 +0100 Subject: [PATCH] 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'. --- man/whatnow.man1 | 3 --- uip/whatnow.c | 17 +++++------------ 2 files changed, 5 insertions(+), 15 deletions(-) diff --git a/man/whatnow.man1 b/man/whatnow.man1 index 764234b..526c71a 100644 --- 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 \-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 --- a/uip/whatnow.c +++ b/uip/whatnow.c @@ -74,7 +74,7 @@ static struct swit aleqs[] = { #define PUSHSW 5 { "push []", 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); -- 1.7.10.4