Fix a segmentation fault introduced by the change of pop_delete to a

quad option.

diff --git a/init.h b/init.h
index 4ef6e5d7c03cd649769105e4d4c5ed21407e83ab..c7401be35970f6ccd0941fdd6c6970f667cade2b 100644 (file)
--- a/init.h
+++ b/init.h
@@ -1406,7 +1406,7 @@ struct option_t MuttVars[] = {
   ** messages to an external Unix command.
   */
 #ifdef USE_POP
-  { "pop_delete",      DT_QUAD, R_NONE, OPTPOPDELETE, M_ASKNO },
+  { "pop_delete",      DT_QUAD, R_NONE, OPT_POPDELETE, M_ASKNO },
   /*
   ** .pp
   ** If set, Mutt will delete successfully downloaded messages from the POP

diff --git a/mutt.h b/mutt.h
index 4325dfd70c93dae4e3bab0becfd1955377af3040..09a42f4138459fc4ac251b1bb69fbe7951781e81 100644 (file)
--- a/mutt.h
+++ b/mutt.h
@@ -243,6 +243,7 @@ enum
   OPT_MIMEFWD,
   OPT_MOVE,
   OPT_COPY,
+  OPT_POPDELETE,
   OPT_POSTPONE,
   OPT_QUIT,
   OPT_REPLYTO,
@@ -323,7 +324,6 @@ enum
   OPTPAGERSTOP,
   OPTPIPEDECODE,
   OPTPIPESPLIT,
-  OPTPOPDELETE,
   OPTPOPLAST,
   OPTPRINTDECODE,
   OPTPROMPTAFTER,

diff --git a/pop.c b/pop.c
index d63104454699ae5db2e0836165052b6d84954779..6623fa86be9e7d3012c88234a61a8a9e303cc922 100644 (file)
--- a/pop.c
+++ b/pop.c
@@ -206,7 +206,7 @@ void mutt_fetchPopMail (void)
   }
 
   if (msgs - last)
-    delanswer = query_quadoption(OPTPOPDELETE, _("Delete messages from server?"));
+    delanswer = query_quadoption(OPT_POPDELETE, _("Delete messages from server?"));
 
   snprintf (msgbuf, sizeof (msgbuf),
            msgs > 1 ? _("Reading new messages (%d bytes)...") :