X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=mutt.h;h=bc599d21f562fd9d5222a5e03e48824fa9d5072d;hp=07eb436a65ffacee90595174dc6d90d07e509226;hb=7dcd7ee09b8760133ac8ec00562e4d60b2f0aebd;hpb=d795d156dff537b76d8e59df5653f199ad06e5b4

diff --git a/mutt.h b/mutt.h
index 07eb436..bc599d2 100644
--- 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
@@ -143,9 +142,6 @@ enum {
 
   /* options for socket code */
   M_NEW_SOCKET,
-#ifdef USE_SSL
-  M_NEW_SSL_SOCKET,
-#endif
 
   /* Options for mutt_save_attachment */
   M_SAVE_APPEND,
@@ -172,11 +168,7 @@ enum {
   OPT_PRINT,
   OPT_REPLYTO,
   OPT_RECALL,
-#if defined(USE_SSL) || defined(USE_GNUTLS)
-  OPT_SSLSTARTTLS,
-#endif
   OPT_SUBJECT,
-  OPT_VERIFYSIG,                /* verify PGP signatures */
   OPT_LISTREPLY,
 #ifdef USE_NNTP
   OPT_TOMODERATED,
@@ -196,11 +188,10 @@ enum {
 #define SENDFORWARD	(1<<3)
 #define SENDPOSTPONED	(1<<4)
 #define SENDBATCH	(1<<5)
-#define SENDKEY		(1<<6)
-#define SENDRESEND	(1<<7)
-#define SENDNEWS	(1<<8)
+#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)
@@ -208,18 +199,13 @@ enum {
 /* boolean vars */
 enum {
   OPTALLOW8BIT,
-  OPTALLOWANSI,
-  OPTARROWCURSOR,
-  OPTASCIICHARS,
   OPTASKBCC,
   OPTASKCC,
   OPTASKFOLLOWUP,
-  OPTASKXCOMMENTTO,
   OPTATTACHSPLIT,
   OPTAUTOEDIT,
   OPTAUTOTAG,
   OPTBOUNCEDELIVERED,
-  OPTBRAILLEFRIENDLY,
   OPTCHECKNEW,
   OPTCOLLAPSEUNREAD,
   OPTCONFIRMAPPEND,
@@ -238,15 +224,10 @@ enum {
   OPTFORCENAME,
   OPTFORWDECODE,
   OPTFORWQUOTE,
-#ifdef USE_HCACHE
-  OPTHCACHEVERIFY,
 #ifdef HAVE_QDBM
   OPTHCACHECOMPRESS,
-#endif /* HAVE_QDBM */
 #endif
-  OPTHDRS,
   OPTHEADER,
-  OPTHELP,
   OPTHIDDENHOST,
   OPTHIDELIMITED,
   OPTHIDEMISSING,
@@ -257,27 +238,13 @@ enum {
   OPTIMAPCHECKSUBSCRIBED,
   OPTIMAPLSUB,
   OPTIMAPPASSIVE,
-  OPTIMAPPEEK,
   OPTIMAPSERVERNOISE,
-#if defined(USE_SSL) || defined(USE_GNUTLS)
-# ifndef USE_GNUTLS
-  OPTSSLSYSTEMCERTS,
-  OPTSSLV2,
-# endif /* !USE_GNUTLS */
-  OPTSSLV3,
-  OPTTLSV1,
-  OPTSSLFORCETLS,
-#endif /* USE_SSL || USE_GNUTLS */
   OPTIMPLICITAUTOVIEW,
-  OPTINCLUDEONLYFIRST,
   OPTKEEPFLAGGED,
   OPTMAILDIRTRASH,
   OPTMARKERS,
   OPTMARKOLD,
   OPTMBOXPANE,
-  OPTMENUSCROLL,                /* scroll menu instead of implicit next-page */
-  OPTMENUMOVEOFF,
-  OPTMETAKEY,                   /* interpret ALT-x as ESC-x */
   OPTMETOO,
   OPTMHPURGE,
   OPTMIMEFORWDECODE,
@@ -285,32 +252,22 @@ enum {
   OPTPAGERSTOP,
   OPTPIPEDECODE,
   OPTPIPESPLIT,
-  OPTPOPAUTHTRYALL,
   OPTPOPLAST,
   OPTPRINTDECODE,
   OPTPRINTSPLIT,
   OPTPROMPTAFTER,
   OPTQUOTEEMPTY,
   OPTQUOTEQUOTED,
-  OPTREADONLY,
-  OPTREPLYSELF,
   OPTRESOLVE,
   OPTREVALIAS,
   OPTREVNAME,
   OPTREVREAL,
-  OPTSAVEADDRESS,
-  OPTSAVEEMPTY,
-  OPTSAVENAME,
-  OPTSCORE,
   OPTSIGDASHES,
   OPTSORTRE,
-  OPTSPAMSEP,
-  OPTSTATUSONTOP,
   OPTSTRICTMAILTO,
   OPTSTRICTTHREADS,
   OPTSTRIPWAS,
   OPTSTUFFQUOTED,
-  OPTSUSPEND,
   OPTTEXTFLOWED,
   OPTTHOROUGHSRC,
   OPTTHREADRECEIVED,
@@ -319,9 +276,6 @@ enum {
   OPTUSEFROM,
 #ifdef HAVE_LIBIDN
   OPTUSEIDN,
-#endif
-#ifdef HAVE_GETADDRINFO
-  OPTUSEIPV6,
 #endif
   OPTWAITKEY,
   OPTWEED,
@@ -334,20 +288,6 @@ enum {
 
   /* PGP options */
 
-  OPTCRYPTAUTOSIGN,
-  OPTCRYPTAUTOENCRYPT,
-  OPTCRYPTAUTOPGP,
-  OPTCRYPTAUTOSMIME,
-  OPTCRYPTREPLYENCRYPT,
-  OPTCRYPTREPLYSIGN,
-  OPTCRYPTREPLYSIGNENCRYPTED,
-  OPTSMIMEISDEFAULT,
-  OPTASKCERTLABEL,
-  OPTSDEFAULTDECRYPTKEY,
-  OPTPGPIGNORESUB,
-  OPTPGPCHECKEXIT,
-  OPTPGPLONGIDS,
-  OPTPGPAUTODEC,
   OPTPGPRETAINABLESIG,
   OPTFORWDECRYPT,
   OPTPGPSHOWUNUSABLE,
@@ -357,9 +297,7 @@ enum {
 #ifdef USE_NNTP
   OPTSHOWNEWNEWS,
   OPTSHOWONLYUNREAD,
-  OPTSAVEUNSUB,
   OPTLOADDESC,
-  OPTXCOMMENTTO,
 #endif                          /* USE_NNTP */
 
   /* pseudo options */
@@ -389,29 +327,26 @@ enum {
   OPTMENUCALLER,                /* (pseudo) tell menu to give caller a take */
   OPTREDRAWTREE,                /* (pseudo) redraw the thread tree */
   OPTPGPCHECKTRUST,             /* (pseudo) used by pgp_select_key () */
-  OPTDONTHANDLEPGPKEYS,         /* (pseudo) used to extract PGP keys */
   OPTUNBUFFEREDINPUT,           /* (pseudo) don't use key buffer */
 
 #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,
   OPTMAX
 };
 
-#define mutt_bit_alloc(n) p_new(char, (n + 7) / 8)
-#define mutt_bit_set(v,n) v[n/8] |= (1 << (n % 8))
-#define mutt_bit_unset(v,n) v[n/8] &= ~(1 << (n % 8))
-#define mutt_bit_toggle(v,n) v[n/8] ^= (1 << (n % 8))
-#define mutt_bit_isset(v,n) (v[n/8] & (1 << (n % 8)))
+#define mutt_bit_set(v,n)    (v[n/8] |=  (1 << (n % 8)))
+#define mutt_bit_unset(v,n)  (v[n/8] &= ~(1 << (n % 8)))
+#define mutt_bit_toggle(v,n) (v[n/8] ^=  (1 << (n % 8)))
+#define mutt_bit_isset(v,n)  (v[n/8] &   (1 << (n % 8)))
 
-#define set_option(x) mutt_bit_set(Options,x)
-#define unset_option(x) mutt_bit_unset(Options,x)
+#define set_option(x)    mutt_bit_set(Options,x)
+#define unset_option(x)  mutt_bit_unset(Options,x)
 #define toggle_option(x) mutt_bit_toggle(Options,x)
-#define option(x) mutt_bit_isset(Options,x)
+#define option(x)        mutt_bit_isset(Options,x)
 
 void mutt_init (int, string_list_t *);