--kill -> --nokeep.

svn path=/trunk/; revision=1214

3 files changed, 11 insertions, 8 deletions

diff --git a/NEWS b/NEWS
index afb8a918..398aceed 100644
--- a/NEWS
+++ b/NEWS
@@ -24,9 +24,11 @@ fetchmail-4.0.6 ()
 * Substantially improved option coverage on the man page.
 * Yet another try at getting the remote-build right for Harry McGavran.
 * Don't emit "No mail" messages in (non-verbose) daemon mode).
+* Fixed the stock POP3 authorization sequence, which got broken in 4.0.4.
+* --kill option renamed to --nokeep for consistency
 
 WARNING: If you are running multidrop, (RE)READ FAQ ITEM F1 NOW!
-There are 255 people on the fetchmail-friends list.
+There are 258 people on the fetchmail-friends list.
 
 fetchmail-4.0.5 (Wed Jul 30 10:27:25 EDT 1997)
 * Increased %o in the Lex source to cope with Ultrix lex.
diff --git a/fetchmail.man b/fetchmail.man
index e6523dff..09f1d6e2 100644
--- a/fetchmail.man
+++ b/fetchmail.man
@@ -118,10 +118,11 @@ Specifying the
 option causes retrieved messages to remain in your folder on the
 mailserver.  This option does not work with ETRN.
 .TP
-.B \-K, --kill
+.B \-K, --nokeep
+(Keyword: nokeep)
 Delete retrieved messages from the remote mailserver.  This
 option forces retrieved mail to be deleted.  It may be useful if
-you have specified a default of \fBnokill\fR in your
+you have specified a default of \fBkeep\fR in your
 \fI.fetchmailrc\fR.  This option is forced on with ETRN.
 .TP
 .B \-F, --flush
@@ -775,7 +776,7 @@ T}
 dropstatus	\&	T{
 Strip Status lines out of incoming mail
 T}
-no keep  	\&	T{
+no keep  	-K	T{
 Delete seen messages from server (default)
 T}
 no flush	\&	T{
diff --git a/options.c b/options.c
index 5789b0ba..99cd156a 100644
--- a/options.c
+++ b/options.c
@@ -36,7 +36,7 @@
 #define LA_ENVELOPE	18
 #define LA_USERNAME	19
 #define LA_ALL          20
-#define LA_KILL		21
+#define LA_NOKEEP		21
 #define	LA_KEEP		22
 #define LA_FLUSH        23
 #define LA_NOREWRITE	24
@@ -81,7 +81,7 @@ static const struct option longoptions[] = {
   {"username",  required_argument, (int *) 0, LA_USERNAME    },
 
   {"all",	no_argument,       (int *) 0, LA_ALL         },
-  {"kill",	no_argument,	   (int *) 0, LA_KILL        },
+  {"nokeep",	no_argument,	   (int *) 0, LA_NOKEEP        },
   {"keep",      no_argument,       (int *) 0, LA_KEEP        },
   {"flush",	no_argument,	   (int *) 0, LA_FLUSH       },
   {"norewrite",	no_argument,	   (int *) 0, LA_NOREWRITE   },
@@ -246,7 +246,7 @@ struct query *ctl;	/* option record to be initialized */
 	    ctl->fetchall = FLAG_TRUE;
 	    break;
 	case 'K':
-	case LA_KILL:
+	case LA_NOKEEP:
 	    ctl->keep = FLAG_FALSE;
 	    break;
 	case 'k':
@@ -366,7 +366,7 @@ struct query *ctl;	/* option record to be initialized */
 
 	fputs("  -u, --username    specify users's login on server\n", stderr);
 	fputs("  -a, --all         retrieve old and new messages\n", stderr);
-	fputs("  -K, --kill        delete new messages after retrieval\n", stderr);
+	fputs("  -K, --nokeep      delete new messages after retrieval\n", stderr);
 	fputs("  -k, --keep        save new messages after retrieval\n", stderr);
 	fputs("  -F, --flush       delete old messages from server\n", stderr);
 	fputs("  -n, --norewrite   don't rewrite header addresses\n", stderr);