X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=mutt.h;h=dc5906418e933d87f6bbebcddb6eb6c4ff4c88b1;hp=f676a9c3542a9e781c15bd825cc88e10f527440c;hb=b314f6b74b24679a37333d74f49553b0a7577d11;hpb=777dc6d5374fd154ac626421c813961b8ab18f2d

diff --git a/mutt.h b/mutt.h
index f676a9c..dc59064 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,9 +196,8 @@ 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)
@@ -318,7 +316,6 @@ enum {
   OPTTILDE,
   OPTUNCOLLAPSEJUMP,
   OPTUSEFROM,
-  OPTUSEGPGAGENT,
 #ifdef HAVE_LIBIDN
   OPTUSEIDN,
 #endif
@@ -343,19 +340,11 @@ enum {
   OPTCRYPTREPLYENCRYPT,
   OPTCRYPTREPLYSIGN,
   OPTCRYPTREPLYSIGNENCRYPTED,
-  OPTCRYPTTIMESTAMP,
   OPTSMIMEISDEFAULT,
-  OPTASKCERTLABEL,
-  OPTSDEFAULTDECRYPTKEY,
-  OPTPGPIGNORESUB,
-  OPTPGPCHECKEXIT,
-  OPTPGPLONGIDS,
   OPTPGPAUTODEC,
   OPTPGPRETAINABLESIG,
   OPTFORWDECRYPT,
   OPTPGPSHOWUNUSABLE,
-  OPTPGPAUTOINLINE,
-  OPTPGPREPLYINLINE,
 
   /* news options */
 
@@ -394,7 +383,6 @@ enum {
   OPTMENUCALLER,                /* (pseudo) tell menu to give caller a take */
   OPTREDRAWTREE,                /* (pseudo) redraw the thread tree */
   OPTPGPCHECKTRUST,             /* (pseudo) used by pgp_select_key () */
-  OPTDONTHANDLEPGPKEYS,         /* (pseudo) used to extract PGP keys */
   OPTUNBUFFEREDINPUT,           /* (pseudo) don't use key buffer */
 
 #ifdef USE_NNTP