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

diff --git a/mutt.h b/mutt.h
index 310c012..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
@@ -192,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)
@@ -200,18 +199,13 @@ enum {
 /* boolean vars */
 enum {
   OPTALLOW8BIT,
-  OPTALLOWANSI,
-  OPTARROWCURSOR,
-  OPTASCIICHARS,
   OPTASKBCC,
   OPTASKCC,
   OPTASKFOLLOWUP,
-  OPTASKXCOMMENTTO,
   OPTATTACHSPLIT,
   OPTAUTOEDIT,
   OPTAUTOTAG,
   OPTBOUNCEDELIVERED,
-  OPTBRAILLEFRIENDLY,
   OPTCHECKNEW,
   OPTCOLLAPSEUNREAD,
   OPTCONFIRMAPPEND,
@@ -233,9 +227,7 @@ enum {
 #ifdef HAVE_QDBM
   OPTHCACHECOMPRESS,
 #endif
-  OPTHDRS,
   OPTHEADER,
-  OPTHELP,
   OPTHIDDENHOST,
   OPTHIDELIMITED,
   OPTHIDEMISSING,
@@ -246,18 +238,13 @@ enum {
   OPTIMAPCHECKSUBSCRIBED,
   OPTIMAPLSUB,
   OPTIMAPPASSIVE,
-  OPTIMAPPEEK,
   OPTIMAPSERVERNOISE,
   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,
@@ -265,29 +252,22 @@ enum {
   OPTPAGERSTOP,
   OPTPIPEDECODE,
   OPTPIPESPLIT,
-  OPTPOPAUTHTRYALL,
   OPTPOPLAST,
   OPTPRINTDECODE,
   OPTPRINTSPLIT,
   OPTPROMPTAFTER,
   OPTQUOTEEMPTY,
   OPTQUOTEQUOTED,
-  OPTREADONLY,
-  OPTREPLYSELF,
   OPTRESOLVE,
   OPTREVALIAS,
   OPTREVNAME,
   OPTREVREAL,
-  OPTSCORE,
   OPTSIGDASHES,
   OPTSORTRE,
-  OPTSPAMSEP,
-  OPTSTATUSONTOP,
   OPTSTRICTMAILTO,
   OPTSTRICTTHREADS,
   OPTSTRIPWAS,
   OPTSTUFFQUOTED,
-  OPTSUSPEND,
   OPTTEXTFLOWED,
   OPTTHOROUGHSRC,
   OPTTHREADRECEIVED,
@@ -297,7 +277,6 @@ enum {
 #ifdef HAVE_LIBIDN
   OPTUSEIDN,
 #endif
-  OPTUSEIPV6,
   OPTWAITKEY,
   OPTWEED,
   OPTWRAP,
@@ -309,7 +288,6 @@ enum {
 
   /* PGP options */
 
-  OPTPGPAUTODEC,
   OPTPGPRETAINABLESIG,
   OPTFORWDECRYPT,
   OPTPGPSHOWUNUSABLE,
@@ -319,9 +297,7 @@ enum {
 #ifdef USE_NNTP
   OPTSHOWNEWNEWS,
   OPTSHOWONLYUNREAD,
-  OPTSAVEUNSUB,
   OPTLOADDESC,
-  OPTXCOMMENTTO,
 #endif                          /* USE_NNTP */
 
   /* pseudo options */
@@ -356,23 +332,21 @@ 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,
   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 *);