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

diff --git a/mutt.h b/mutt.h
index 2bf0141..bc599d2 100644
--- a/mutt.h
+++ b/mutt.h
@@ -191,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)
@@ -199,8 +199,6 @@ enum {
 /* boolean vars */
 enum {
   OPTALLOW8BIT,
-  OPTALLOWANSI,
-  OPTASCIICHARS,
   OPTASKBCC,
   OPTASKCC,
   OPTASKFOLLOWUP,
@@ -208,7 +206,6 @@ enum {
   OPTAUTOEDIT,
   OPTAUTOTAG,
   OPTBOUNCEDELIVERED,
-  OPTBRAILLEFRIENDLY,
   OPTCHECKNEW,
   OPTCOLLAPSEUNREAD,
   OPTCONFIRMAPPEND,
@@ -231,7 +228,6 @@ enum {
   OPTHCACHECOMPRESS,
 #endif
   OPTHEADER,
-  OPTHELP,
   OPTHIDDENHOST,
   OPTHIDELIMITED,
   OPTHIDEMISSING,
@@ -249,9 +245,6 @@ enum {
   OPTMARKERS,
   OPTMARKOLD,
   OPTMBOXPANE,
-  OPTMENUSCROLL,                /* scroll menu instead of implicit next-page */
-  OPTMENUMOVEOFF,
-  OPTMETAKEY,                   /* interpret ALT-x as ESC-x */
   OPTMETOO,
   OPTMHPURGE,
   OPTMIMEFORWDECODE,
@@ -265,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,
@@ -289,7 +277,6 @@ enum {
 #ifdef HAVE_LIBIDN
   OPTUSEIDN,
 #endif
-  OPTUSEIPV6,
   OPTWAITKEY,
   OPTWEED,
   OPTWRAP,
@@ -301,7 +288,6 @@ enum {
 
   /* PGP options */
 
-  OPTPGPAUTODEC,
   OPTPGPRETAINABLESIG,
   OPTFORWDECRYPT,
   OPTPGPSHOWUNUSABLE,
@@ -311,7 +297,6 @@ enum {
 #ifdef USE_NNTP
   OPTSHOWNEWNEWS,
   OPTSHOWONLYUNREAD,
-  OPTSAVEUNSUB,
   OPTLOADDESC,
 #endif                          /* USE_NNTP */
 
@@ -347,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 *);