various rewrites and cleanups.

[apps/madmutt.git] / mutt.h

diff --git a/mutt.h b/mutt.h
index f676a9c..1ee8fb4 100644 (file)
--- 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 */