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

diff --git a/mutt.h b/mutt.h
index d11f1cc..fa33d31 100644
--- a/mutt.h
+++ b/mutt.h
@@ -457,6 +457,7 @@ enum
   OPTSORTRE,
   OPTSPAMSEP,
   OPTSTATUSONTOP,
+  OPTSTRICTMIME,
   OPTSTRICTTHREADS,
   OPTSTUFFQUOTED,
   OPTSUSPEND,
@@ -469,6 +470,9 @@ enum
   OPTUSEDOMAIN,
   OPTUSEFROM,
   OPTUSEGPGAGENT,
+#ifdef HAVE_LIBIDN
+  OPTUSEIDN,
+#endif
 #ifdef HAVE_GETADDRINFO
   OPTUSEIPV6,
 #endif
@@ -498,6 +502,7 @@ enum
   OPTPGPIGNORESUB,
   OPTPGPCHECKEXIT,
   OPTPGPLONGIDS,
+  OPTPGPAUTODEC,
 #if 0
   OPTPGPENCRYPTSELF,
 #endif
@@ -554,6 +559,7 @@ 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 */
 
   OPTMAX
 };
@@ -692,6 +698,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