X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=mutt.h;h=1ee8fb4115cbe016c1757fcdcba4574367fc60b9;hp=336ebe1ff1700cdcc39f202733efc022f5dd5fe4;hb=73359dc55ff8f4da32149f7270f7ceaccd658256;hpb=20392fc3c433909de76c676c235524acd96bec60

diff --git a/mutt.h b/mutt.h
index 336ebe1..1ee8fb4 100644
--- a/mutt.h
+++ b/mutt.h
@@ -166,7 +166,6 @@ enum {
   OPT_MIMEFWD,
   OPT_MIMEFWDREST,
   OPT_MOVE,
-  OPT_PGPMIMEAUTO,              /* ask to revert to PGP/MIME when inline fails */
   OPT_POPDELETE,
   OPT_POPRECONNECT,
   OPT_POSTPONE,
@@ -197,19 +196,14 @@ enum {
 #define SENDFORWARD	(1<<3)
 #define SENDPOSTPONED	(1<<4)
 #define SENDBATCH	(1<<5)
-#define SENDKEY		(1<<6)
-#define SENDRESEND	(1<<7)
-#define SENDNEWS	(1<<8)
+#define SENDRESEND	(1<<6)
+#define SENDNEWS	(1<<7)
 
 /* flags to _mutt_select_file() */
 #define M_SEL_BUFFY	(1<<0)
 #define M_SEL_MULTI	(1<<1)
 #define M_SEL_FOLDER	(1<<2)
 
-/* flags for parse_spam_list */
-#define M_SPAM          1
-#define M_NOSPAM        2
-
 /* boolean vars */
 enum {
   OPTALLOW8BIT,
@@ -276,7 +270,6 @@ enum {
   OPTIMPLICITAUTOVIEW,
   OPTINCLUDEONLYFIRST,
   OPTKEEPFLAGGED,
-  OPTMAILCAPSANITIZE,
   OPTMAILDIRTRASH,
   OPTMARKERS,
   OPTMARKOLD,
@@ -287,9 +280,6 @@ enum {
   OPTMETOO,
   OPTMHPURGE,
   OPTMIMEFORWDECODE,
-#ifdef USE_NNTP
-  OPTMIMESUBJECT,               /* encode subject line with RFC2047 */
-#endif
   OPTNARROWTREE,
   OPTPAGERSTOP,
   OPTPIPEDECODE,
@@ -312,7 +302,6 @@ enum {
   OPTSAVENAME,
   OPTSCORE,
   OPTSIGDASHES,
-  OPTSIGONTOP,
   OPTSORTRE,
   OPTSPAMSEP,
   OPTSTATUSONTOP,
@@ -327,7 +316,6 @@ enum {
   OPTTILDE,
   OPTUNCOLLAPSEJUMP,
   OPTUSEFROM,
-  OPTUSEGPGAGENT,
 #ifdef HAVE_LIBIDN
   OPTUSEIDN,
 #endif
@@ -343,8 +331,6 @@ enum {
   OPTXMAILTO,                   /* 1 if $edit_header is forcebly set */
   OPTXTERMSETTITLES,
 
-  OPTCRYPTUSEGPGME,
-
   /* PGP options */
 
   OPTCRYPTAUTOSIGN,
@@ -354,20 +340,11 @@ enum {
   OPTCRYPTREPLYENCRYPT,
   OPTCRYPTREPLYSIGN,
   OPTCRYPTREPLYSIGNENCRYPTED,
-  OPTCRYPTTIMESTAMP,
   OPTSMIMEISDEFAULT,
-  OPTASKCERTLABEL,
-  OPTSDEFAULTDECRYPTKEY,
-  OPTPGPIGNORESUB,
-  OPTPGPCHECKEXIT,
-  OPTPGPLONGIDS,
   OPTPGPAUTODEC,
   OPTPGPRETAINABLESIG,
-  OPTPGPSTRICTENC,
   OPTFORWDECRYPT,
   OPTPGPSHOWUNUSABLE,
-  OPTPGPAUTOINLINE,
-  OPTPGPREPLYINLINE,
 
   /* news options */