X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=mutt.h;h=336ebe1ff1700cdcc39f202733efc022f5dd5fe4;hp=15a971035cf3c472f48acdcc4cfa3b44b3f75bc8;hb=8f75834aeadb902879602a82a259f4d3bf9c569c;hpb=552847916ae6671d52db12880ee337f880cc766b

diff --git a/mutt.h b/mutt.h
index 15a9710..336ebe1 100644
--- a/mutt.h
+++ b/mutt.h
@@ -37,17 +37,15 @@ typedef struct {
 #define M_SENDHOOK	(1<<2)
 #define M_FCCHOOK	(1<<3)
 #define M_SAVEHOOK	(1<<4)
-#define M_CHARSETHOOK	(1<<5)
-#define M_ICONVHOOK 	(1<<6)
-#define M_MESSAGEHOOK	(1<<7)
-#define M_CRYPTHOOK	(1<<8)
-#define M_ACCOUNTHOOK	(1<<9)
-#define M_REPLYHOOK	(1<<10)
-#define M_SEND2HOOK     (1<<11)
-
-#define M_OPENHOOK	(1<<12)
-#define M_APPENDHOOK	(1<<13)
-#define M_CLOSEHOOK	(1<<14)
+#define M_MESSAGEHOOK	(1<<5)
+#define M_CRYPTHOOK	(1<<6)
+#define M_ACCOUNTHOOK	(1<<7)
+#define M_REPLYHOOK	(1<<8)
+#define M_SEND2HOOK     (1<<9)
+
+#define M_OPENHOOK	(1<<10)
+#define M_APPENDHOOK	(1<<11)
+#define M_CLOSEHOOK	(1<<12)
 
 /* tree characters for linearize_tree and print_enriched_string */
 #define M_TREE_LLCORNER		1
@@ -237,7 +235,6 @@ enum {
   OPTDUPTHREADS,
   OPTEDITHDRS,
   OPTENCODEFROM,
-  OPTENVFROM,
   OPTFASTREPLY,
   OPTFCCATTACH,
   OPTFCCCLEAR,
@@ -329,7 +326,6 @@ enum {
   OPTTHREADRECEIVED,
   OPTTILDE,
   OPTUNCOLLAPSEJUMP,
-  OPTUSE8BITMIME,
   OPTUSEFROM,
   OPTUSEGPGAGENT,
 #ifdef HAVE_LIBIDN