fix parsing issues in slurp_newsrc

[apps/madmutt.git] / mutt.h

diff --git a/mutt.h b/mutt.h
index 5b790d0..d324819 100644 (file)
--- a/mutt.h
+++ b/mutt.h
@@ -32,20 +32,19 @@ typedef struct {
 } event_t;
 
 /* types for mutt_add_hook() */
-#define M_FOLDERHOOK   1
+#define M_FOLDERHOOK   (1<<0)
 #define M_MBOXHOOK     (1<<1)
 #define M_SENDHOOK     (1<<2)
 #define M_FCCHOOK      (1<<3)
 #define M_SAVEHOOK     (1<<4)
 #define M_MESSAGEHOOK  (1<<5)
 #define M_CRYPTHOOK    (1<<6)
-#define M_ACCOUNTHOOK  (1<<7)
-#define M_REPLYHOOK    (1<<8)
-#define M_SEND2HOOK     (1<<9)
+#define M_REPLYHOOK    (1<<7)
+#define M_SEND2HOOK     (1<<8)
 
-#define M_OPENHOOK     (1<<10)
-#define M_APPENDHOOK   (1<<11)
-#define M_CLOSEHOOK    (1<<12)
+#define M_OPENHOOK     (1<<9)
+#define M_APPENDHOOK   (1<<10)
+#define M_CLOSEHOOK    (1<<11)
 
 /* tree characters for linearize_tree and print_enriched_string */
 #define M_TREE_LLCORNER                1
@@ -169,9 +168,7 @@ enum {
   OPT_PRINT,
   OPT_REPLYTO,
   OPT_RECALL,
-  OPT_SSLSTARTTLS,
   OPT_SUBJECT,
-  OPT_VERIFYSIG,                /* verify PGP signatures */
   OPT_LISTREPLY,
 #ifdef USE_NNTP
   OPT_TOMODERATED,
@@ -194,7 +191,7 @@ enum {
 #define SENDRESEND     (1<<6)
 #define SENDNEWS       (1<<7)
 
-/* flags to _mutt_select_file() */
+/* flags to mutt_select_file() */
 #define M_SEL_BUFFY    (1<<0)
 #define M_SEL_MULTI    (1<<1)
 #define M_SEL_FOLDER   (1<<2)
@@ -203,12 +200,10 @@ enum {
 enum {
   OPTALLOW8BIT,
   OPTALLOWANSI,
-  OPTARROWCURSOR,
   OPTASCIICHARS,
   OPTASKBCC,
   OPTASKCC,
   OPTASKFOLLOWUP,
-  OPTASKXCOMMENTTO,
   OPTATTACHSPLIT,
   OPTAUTOEDIT,
   OPTAUTOTAG,
@@ -235,7 +230,6 @@ enum {
 #ifdef HAVE_QDBM
   OPTHCACHECOMPRESS,
 #endif
-  OPTHDRS,
   OPTHEADER,
   OPTHELP,
   OPTHIDDENHOST,
@@ -248,13 +242,8 @@ enum {
   OPTIMAPCHECKSUBSCRIBED,
   OPTIMAPLSUB,
   OPTIMAPPASSIVE,
-  OPTIMAPPEEK,
   OPTIMAPSERVERNOISE,
-  OPTSSLV3,
-  OPTTLSV1,
-  OPTSSLFORCETLS,
   OPTIMPLICITAUTOVIEW,
-  OPTINCLUDEONLYFIRST,
   OPTKEEPFLAGGED,
   OPTMAILDIRTRASH,
   OPTMARKERS,
@@ -270,7 +259,6 @@ enum {
   OPTPAGERSTOP,
   OPTPIPEDECODE,
   OPTPIPESPLIT,
-  OPTPOPAUTHTRYALL,
   OPTPOPLAST,
   OPTPRINTDECODE,
   OPTPRINTSPLIT,
@@ -283,7 +271,6 @@ enum {
   OPTREVALIAS,
   OPTREVNAME,
   OPTREVREAL,
-  OPTSCORE,
   OPTSIGDASHES,
   OPTSORTRE,
   OPTSPAMSEP,
@@ -314,15 +301,6 @@ enum {
 
   /* PGP options */
 
-  OPTCRYPTAUTOSIGN,
-  OPTCRYPTAUTOENCRYPT,
-  OPTCRYPTAUTOPGP,
-  OPTCRYPTAUTOSMIME,
-  OPTCRYPTREPLYENCRYPT,
-  OPTCRYPTREPLYSIGN,
-  OPTCRYPTREPLYSIGNENCRYPTED,
-  OPTSMIMEISDEFAULT,
-  OPTPGPAUTODEC,
   OPTPGPRETAINABLESIG,
   OPTFORWDECRYPT,
   OPTPGPSHOWUNUSABLE,
@@ -332,9 +310,7 @@ enum {
 #ifdef USE_NNTP
   OPTSHOWNEWNEWS,
   OPTSHOWONLYUNREAD,
-  OPTSAVEUNSUB,
   OPTLOADDESC,
-  OPTXCOMMENTTO,
 #endif                          /* USE_NNTP */
 
   /* pseudo options */
@@ -369,7 +345,6 @@ enum {
 #ifdef USE_NNTP
   OPTNEWS,                      /* (pseudo) used to change reader mode */
   OPTNEWSSEND,                  /* (pseudo) used to change behavior when posting */
-  OPTNEWSCACHE,                 /* (pseudo) used to indicate if news cache exist */
 #endif
   OPTSHORTENHIERARCHY,          /* set when to shorten "hierarchies" in the sidebar */
   OPTSIDEBARNEWMAILONLY,