X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=mutt.h;h=72316f01bd10f8a1759571c5ede261d520682d92;hp=d11f1cc34b2dea2db52839839cb7924ce6f9e8c0;hb=939231b97323754e1329160d25212083242f7e09;hpb=170b2f011c6e3616b24ae69bd181c4915ba6eb67

diff --git a/mutt.h b/mutt.h
index d11f1cc..72316f0 100644
--- a/mutt.h
+++ b/mutt.h
@@ -1,4 +1,3 @@
-
 /*
  * Copyright (C) 1996-2002 Michael R. Elkins <me@mutt.org>
  * Copyright (C) 2004 g10 Code GmbH
@@ -219,6 +218,7 @@ enum
   M_LIMIT,
   M_EXPIRED,
   M_SUPERSEDED,
+  M_REALNAME,
 
   /* actions for mutt_pattern_comp/mutt_pattern_exec */
   M_AND,
@@ -377,6 +377,7 @@ enum
   OPTFCCATTACH,
   OPTFCCCLEAR,
   OPTFOLLOWUPTO,
+  OPTFORCEBUFFYCHECK,
   OPTFORCENAME,
   OPTFORWDECODE,
   OPTFORWQUOTE,
@@ -421,6 +422,7 @@ enum
   OPTMARKOLD,
   OPTMBOXPANE,
   OPTMENUSCROLL,	/* scroll menu instead of implicit next-page */
+  OPTMENUMOVEOFF,
   OPTMETAKEY,		/* interpret ALT-x as ESC-x */
   OPTMETOO,
   OPTMHPURGE,
@@ -457,7 +459,9 @@ enum
   OPTSORTRE,
   OPTSPAMSEP,
   OPTSTATUSONTOP,
+  OPTSTRICTMIME,
   OPTSTRICTTHREADS,
+  OPTSTRIPWAS,
   OPTSTUFFQUOTED,
   OPTSUSPEND,
   OPTTEXTFLOWED,
@@ -469,6 +473,9 @@ enum
   OPTUSEDOMAIN,
   OPTUSEFROM,
   OPTUSEGPGAGENT,
+#ifdef HAVE_LIBIDN
+  OPTUSEIDN,
+#endif
 #ifdef HAVE_GETADDRINFO
   OPTUSEIPV6,
 #endif
@@ -498,6 +505,7 @@ enum
   OPTPGPIGNORESUB,
   OPTPGPCHECKEXIT,
   OPTPGPLONGIDS,
+  OPTPGPAUTODEC,
 #if 0
   OPTPGPENCRYPTSELF,
 #endif
@@ -554,7 +562,8 @@ enum
   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
 };
 
@@ -692,6 +701,7 @@ typedef struct body
 				 * If NULL, filename is used 
 				 * instead.
 				 */
+  char *file_charset;           /* charset of attached file */
   CONTENT *content;             /* structure used to store detailed info about
 				 * the content of the attachment.  this is used
 				 * to determine what content-transfer-encoding
@@ -809,9 +819,7 @@ typedef struct header
   char *tree;           	/* character string to print thread tree */
   struct thread *thread;
 
-#ifdef IMAP_EDIT_THREADS
   ENVELOPE *new_env;	/* envelope information for rethreading */
-#endif
 
 #ifdef MIXMASTER
   LIST *chain;