X-Git-Url: http://git.madism.org/?a=blobdiff_plain;f=mutt.h;h=336ebe1ff1700cdcc39f202733efc022f5dd5fe4;hb=94c83f42e786ffbebb2ea3defcd6df95efe116f0;hp=47586238891e3594ecdb0c6a5d339a33e4f16ac2;hpb=56ac9bea51f338d488828ad1114d58b4a9542209;p=apps%2Fmadmutt.git

diff --git a/mutt.h b/mutt.h
index 4758623..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
@@ -225,8 +223,6 @@ enum {
   OPTATTACHSPLIT,
   OPTAUTOEDIT,
   OPTAUTOTAG,
-  OPTBEEP,
-  OPTBEEPNEW,
   OPTBOUNCEDELIVERED,
   OPTBRAILLEFRIENDLY,
   OPTCHECKNEW,
@@ -239,7 +235,6 @@ enum {
   OPTDUPTHREADS,
   OPTEDITHDRS,
   OPTENCODEFROM,
-  OPTENVFROM,
   OPTFASTREPLY,
   OPTFCCATTACH,
   OPTFCCCLEAR,
@@ -312,7 +307,6 @@ enum {
   OPTREVALIAS,
   OPTREVNAME,
   OPTREVREAL,
-  OPTRFC2047PARAMS,
   OPTSAVEADDRESS,
   OPTSAVEEMPTY,
   OPTSAVENAME,
@@ -323,7 +317,6 @@ enum {
   OPTSPAMSEP,
   OPTSTATUSONTOP,
   OPTSTRICTMAILTO,
-  OPTSTRICTMIME,
   OPTSTRICTTHREADS,
   OPTSTRIPWAS,
   OPTSTUFFQUOTED,
@@ -333,8 +326,6 @@ enum {
   OPTTHREADRECEIVED,
   OPTTILDE,
   OPTUNCOLLAPSEJUMP,
-  OPTUSE8BITMIME,
-  OPTUSEDOMAIN,
   OPTUSEFROM,
   OPTUSEGPGAGENT,
 #ifdef HAVE_LIBIDN