take more cruft to the bin

[apps/madmutt.git] / init.h

diff --git a/init.h b/init.h
index fbae7da..df18efe 100644 (file)
--- a/init.h
+++ b/init.h
@@ -1725,46 +1725,6 @@ struct option_t MuttVars[] = {
    ** removed, while the inner multipart/signed part is retained.
    ** (PGP only)
    */
-  {"pgp_autoinline", DT_BOOL, R_NONE, OPTPGPAUTOINLINE, "no" },
-  /*
-   ** .pp
-   ** This option controls whether Madmutt generates old-style inline
-   ** (traditional) PGP encrypted or signed messages under certain
-   ** circumstances.  This can be overridden by use of the \fIpgp-menu\fP,
-   ** when inline is not required.
-   ** .pp
-   ** Note that Madmutt might automatically use PGP/MIME for messages
-   ** which consist of more than a single MIME part.  Madmutt can be
-   ** configured to ask before sending PGP/MIME messages when inline
-   ** (traditional) would not work.
-   ** See also: ``$$pgp_mime_auto''.
-   ** .pp
-   ** Also note that using the old-style PGP message format is \fBstrongly\fP
-   ** \fBdeprecated\fP.
-   ** (PGP only)
-   */
-  {"pgp_replyinline", DT_BOOL, R_NONE, OPTPGPREPLYINLINE, "no" },
-  /*
-   ** .pp
-   ** Setting this variable will cause Madmutt to always attempt to
-   ** create an inline (traditional) message when replying to a
-   ** message which is PGP encrypted/signed inline.  This can be
-   ** overridden by use of the \fIpgp-menu\fP, when inline is not
-   ** required.  This option does not automatically detect if the
-   ** (replied-to) message is inline; instead it relies on Madmutt
-   ** internals for previously checked/flagged messages.
-   ** .pp
-   ** Note that Madmutt might automatically use PGP/MIME for messages
-   ** which consist of more than a single MIME part.  Madmutt can be
-   ** configured to ask before sending PGP/MIME messages when inline
-   ** (traditional) would not work.
-   ** See also: ``$$pgp_mime_auto''.
-   ** .pp
-   ** Also note that using the old-style PGP message format is \fBstrongly\fP
-   ** \fBdeprecated\fP.
-   ** (PGP only)
-   **
-   */
   {"pgp_show_unusable", DT_BOOL, R_NONE, OPTPGPSHOWUNUSABLE, "yes" },
   /*
    ** .pp
@@ -1805,17 +1765,6 @@ struct option_t MuttVars[] = {
    ** ``reverse-''.
    ** (PGP only)
    */
-  {"pgp_mime_auto", DT_QUAD, R_NONE, OPT_PGPMIMEAUTO, "ask-yes" },
-  /*
-   ** .pp
-   ** This option controls whether Madmutt will prompt you for
-   ** automatically sending a (signed/encrypted) message using
-   ** PGP/MIME when inline (traditional) fails (for any reason).
-   ** .pp
-   ** Also note that using the old-style PGP message format is \fBstrongly\fP
-   ** \fBdeprecated\fP.
-   ** (PGP only)
-   */
   {"pgp_auto_decode", DT_BOOL, R_NONE, OPTPGPAUTODEC, "no" },
   /*
    ** .pp