X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=mutt.h;h=f2c5dfaead48be1fc3c4466a59b5be16c6b12377;hp=39b1508fbd198f0686807c898f1bbdc649b71d2e;hb=e39e529e5df06cd4148de4614073b66a23be0b26;hpb=9a1805afc94b21d8766e6e67ef57f92aaf966e84

diff --git a/mutt.h b/mutt.h
index 39b1508..f2c5dfa 100644
--- a/mutt.h
+++ b/mutt.h
@@ -53,11 +53,7 @@
 # define MB_LEN_MAX 16
 #endif
 
-#ifdef SUBVERSION
-# define MUTT_VERSION (VERSION SUBVERSION)
-#else
 # define MUTT_VERSION (VERSION)
-#endif
 
 /* nifty trick I stole from ELM 2.5alpha. */
 #ifdef MAIN_C
@@ -346,6 +342,7 @@ enum {
   OPTBEEP,
   OPTBEEPNEW,
   OPTBOUNCEDELIVERED,
+  OPTBRAILLEFRIENDLY,
   OPTCHECKNEW,
   OPTCOLLAPSEUNREAD,
   OPTCONFIRMAPPEND,
@@ -366,6 +363,9 @@ enum {
   OPTFORWQUOTE,
 #if USE_HCACHE
   OPTHCACHEVERIFY,
+#if HAVE_QDBM
+  OPTHCACHECOMPRESS,
+#endif /* HAVE_QDBM */
 #endif
   OPTHDRS,
   OPTHEADER,
@@ -442,6 +442,7 @@ enum {
   OPTSORTRE,
   OPTSPAMSEP,
   OPTSTATUSONTOP,
+  OPTSTRICTMAILTO,
   OPTSTRICTMIME,
   OPTSTRICTTHREADS,
   OPTSTRIPWAS,
@@ -627,6 +628,8 @@ typedef struct envelope {
   LIST *references;             /* message references (in reverse order) */
   LIST *in_reply_to;            /* in-reply-to header content */
   LIST *userhdrs;               /* user defined headers */
+  unsigned int irt_changed:1;   /* In-Reply-To changed to link/break threads */
+  unsigned int refs_changed:1;  /* References changed to break thread */
 } ENVELOPE;
 
 typedef struct parameter {
@@ -742,8 +745,6 @@ typedef struct header {
   unsigned int subject_changed:1;       /* used for threading */
   unsigned int threaded:1;      /* used for threading */
   unsigned int display_subject:1;       /* used for threading */
-  unsigned int irt_changed:1;   /* In-Reply-To changed to link/break threads */
-  unsigned int refs_changed:1;  /* References changed to break thread */
   unsigned int recip_valid:1;   /* is_recipient is valid */
   unsigned int active:1;        /* message is not to be removed */
   unsigned int trash:1;         /* message is marked as trashed on disk.
@@ -787,8 +788,6 @@ typedef struct header {
   char *tree;                   /* character string to print thread tree */
   struct thread *thread;
 
-  ENVELOPE *new_env;            /* envelope information for rethreading */
-
 #ifdef MIXMASTER
   LIST *chain;
 #endif