Update to latest madtty.

[apps/madmutt.git] / mutt.h

diff --git a/mutt.h b/mutt.h
index bc599d2..21ef4a7 100644 (file)
--- a/mutt.h
+++ b/mutt.h
@@ -15,7 +15,7 @@
 #include <lib-mime/mime.h>
 #include <lib-lua/lib-lua.h>
 
-#define MUTT_VERSION (VERSION)
+#define MUTT_VERSION  VERSION
 
 /* nifty trick I stole from ELM 2.5alpha. */
 #ifdef MAIN_C
@@ -128,9 +128,6 @@ enum {
   M_PGP_KEY,
   M_XLABEL,
   M_MIMEATTACH,
-#ifdef USE_NNTP
-  M_NEWSGROUPS,
-#endif
   M_REALNAME,
   M_MULTIPART,
 
@@ -170,12 +167,6 @@ enum {
   OPT_RECALL,
   OPT_SUBJECT,
   OPT_LISTREPLY,
-#ifdef USE_NNTP
-  OPT_TOMODERATED,
-  OPT_NNTPRECONNECT,
-  OPT_CATCHUP,
-  OPT_FOLLOWUPTOPOSTER,
-#endif                          /* USE_NNTP */
 
   /* THIS MUST BE THE LAST VALUE. */
   OPT_MAX
@@ -191,11 +182,6 @@ enum {
 #define SENDRESEND     (1<<6)
 #define SENDNEWS       (1<<7)
 
-/* flags to mutt_select_file() */
-#define M_SEL_BUFFY    (1<<0)
-#define M_SEL_MULTI    (1<<1)
-#define M_SEL_FOLDER   (1<<2)
-
 /* boolean vars */
 enum {
   OPTALLOW8BIT,
@@ -224,9 +210,6 @@ enum {
   OPTFORCENAME,
   OPTFORWDECODE,
   OPTFORWQUOTE,
-#ifdef HAVE_QDBM
-  OPTHCACHECOMPRESS,
-#endif
   OPTHEADER,
   OPTHIDDENHOST,
   OPTHIDELIMITED,
@@ -245,6 +228,8 @@ enum {
   OPTMARKERS,
   OPTMARKOLD,
   OPTMBOXPANE,
+  OPTSHORTENHIERARCHY,          /* set when to shorten "hierarchies" in the sidebar */
+  OPTSIDEBARNEWMAILONLY,
   OPTMETOO,
   OPTMHPURGE,
   OPTMIMEFORWDECODE,
@@ -274,9 +259,7 @@ enum {
   OPTTILDE,
   OPTUNCOLLAPSEJUMP,
   OPTUSEFROM,
-#ifdef HAVE_LIBIDN
   OPTUSEIDN,
-#endif
   OPTWAITKEY,
   OPTWEED,
   OPTWRAP,
@@ -287,18 +270,14 @@ enum {
   OPTXTERMSETTITLES,
 
   /* PGP options */
-
   OPTPGPRETAINABLESIG,
   OPTFORWDECRYPT,
   OPTPGPSHOWUNUSABLE,
 
   /* news options */
-
-#ifdef USE_NNTP
   OPTSHOWNEWNEWS,
   OPTSHOWONLYUNREAD,
   OPTLOADDESC,
-#endif                          /* USE_NNTP */
 
   /* pseudo options */
 
@@ -328,25 +307,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 *);