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

diff --git a/mutt.h b/mutt.h
index bc599d2..5830c09 100644
--- a/mutt.h
+++ b/mutt.h
@@ -224,9 +224,6 @@ enum {
   OPTFORCENAME,
   OPTFORWDECODE,
   OPTFORWQUOTE,
-#ifdef HAVE_QDBM
-  OPTHCACHECOMPRESS,
-#endif
   OPTHEADER,
   OPTHIDDENHOST,
   OPTHIDELIMITED,
@@ -245,6 +242,8 @@ enum {
   OPTMARKERS,
   OPTMARKOLD,
   OPTMBOXPANE,
+  OPTSHORTENHIERARCHY,          /* set when to shorten "hierarchies" in the sidebar */
+  OPTSIDEBARNEWMAILONLY,
   OPTMETOO,
   OPTMHPURGE,
   OPTMIMEFORWDECODE,
@@ -274,9 +273,7 @@ enum {
   OPTTILDE,
   OPTUNCOLLAPSEJUMP,
   OPTUSEFROM,
-#ifdef HAVE_LIBIDN
   OPTUSEIDN,
-#endif
   OPTWAITKEY,
   OPTWEED,
   OPTWRAP,
@@ -287,18 +284,14 @@ enum {
   OPTXTERMSETTITLES,
 
   /* PGP options */
-
   OPTPGPRETAINABLESIG,
   OPTFORWDECRYPT,
   OPTPGPSHOWUNUSABLE,
 
   /* news options */
-
-#ifdef USE_NNTP
   OPTSHOWNEWNEWS,
   OPTSHOWONLYUNREAD,
   OPTLOADDESC,
-#endif                          /* USE_NNTP */
 
   /* pseudo options */
 
@@ -328,25 +321,20 @@ enum {
   OPTREDRAWTREE,                /* (pseudo) redraw the thread tree */
   OPTPGPCHECKTRUST,             /* (pseudo) used by pgp_select_key () */
   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 */
-#endif
-  OPTSHORTENHIERARCHY,          /* set when to shorten "hierarchies" in the sidebar */
-  OPTSIDEBARNEWMAILONLY,
   OPTMAX
 };
 
-#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 & 7)))
+#define mutt_bit_unset(v,n)  (v[n / 8] &= ~(1 << (n & 7)))
+#define mutt_bit_toggle(v,n) (v[n / 8] ^=  (1 << (n & 7)))
+#define mutt_bit_isset(v,n)  (v[n / 8] &   (1 << (n & 7)))
 
-#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 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)
 
 void mutt_init (int, string_list_t *);