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

diff --git a/mutt.h b/mutt.h
index f12bf9b..bc599d2 100644
--- a/mutt.h
+++ b/mutt.h
@@ -199,7 +199,6 @@ enum {
 /* boolean vars */
 enum {
   OPTALLOW8BIT,
-  OPTALLOWANSI,
   OPTASKBCC,
   OPTASKCC,
   OPTASKFOLLOWUP,
@@ -207,7 +206,6 @@ enum {
   OPTAUTOEDIT,
   OPTAUTOTAG,
   OPTBOUNCEDELIVERED,
-  OPTBRAILLEFRIENDLY,
   OPTCHECKNEW,
   OPTCOLLAPSEUNREAD,
   OPTCONFIRMAPPEND,
@@ -230,7 +228,6 @@ enum {
   OPTHCACHECOMPRESS,
 #endif
   OPTHEADER,
-  OPTHELP,
   OPTHIDDENHOST,
   OPTHIDELIMITED,
   OPTHIDEMISSING,
@@ -248,8 +245,6 @@ enum {
   OPTMARKERS,
   OPTMARKOLD,
   OPTMBOXPANE,
-  OPTMENUSCROLL,                /* scroll menu instead of implicit next-page */
-  OPTMENUMOVEOFF,
   OPTMETOO,
   OPTMHPURGE,
   OPTMIMEFORWDECODE,
@@ -263,21 +258,16 @@ enum {
   OPTPROMPTAFTER,
   OPTQUOTEEMPTY,
   OPTQUOTEQUOTED,
-  OPTREADONLY,
-  OPTREPLYSELF,
   OPTRESOLVE,
   OPTREVALIAS,
   OPTREVNAME,
   OPTREVREAL,
   OPTSIGDASHES,
   OPTSORTRE,
-  OPTSPAMSEP,
-  OPTSTATUSONTOP,
   OPTSTRICTMAILTO,
   OPTSTRICTTHREADS,
   OPTSTRIPWAS,
   OPTSTUFFQUOTED,
-  OPTSUSPEND,
   OPTTEXTFLOWED,
   OPTTHOROUGHSRC,
   OPTTHREADRECEIVED,
@@ -287,7 +277,6 @@ enum {
 #ifdef HAVE_LIBIDN
   OPTUSEIDN,
 #endif
-  OPTUSEIPV6,
   OPTWAITKEY,
   OPTWEED,
   OPTWRAP,
@@ -349,16 +338,15 @@ enum {
   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 *);