X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=init.h;h=046fecd32d67d3b6f322ff9537250169eca0b209;hp=b4bd6a2dcbb9608e6ec68bae3b4f4ca439b48a70;hb=d6390d86146aebd0e2eacb4674a49954514edaff;hpb=e4360f3016dc130069b68459ef3942a26347358c

diff --git a/init.h b/init.h
index b4bd6a2..046fecd 100644
--- a/init.h
+++ b/init.h
@@ -1583,14 +1583,6 @@ struct option_t MuttVars[] = {
    ** settings can be overridden by use of the \fIsmime-menu\fP.
    ** (Crypto only)
    */
-  {"pgp_ignore_subkeys", DT_BOOL, R_NONE, OPTPGPIGNORESUB, "yes" },
-  /*
-   ** .pp
-   ** Setting this variable will cause Madmutt to ignore OpenPGP subkeys. Instead,
-   ** the principal key will inherit the subkeys' capabilities. \fIUnset\fP this
-   ** if you want to play interesting key selection games.
-   ** (PGP only)
-   */
   {"crypt_replyencrypt", DT_BOOL, R_NONE, OPTCRYPTREPLYENCRYPT, "yes" },
   /*
    ** .pp
@@ -1618,15 +1610,6 @@ struct option_t MuttVars[] = {
    ** to find out whether an encrypted message is also signed.
    ** (Crypto only)
    */
-  {"crypt_timestamp", DT_BOOL, R_NONE, OPTCRYPTTIMESTAMP, "yes" },
-  /*
-   ** .pp
-   ** If \fIset\fP, Madmutt will include a time stamp in the lines surrounding
-   ** PGP or S/MIME output, so spoofing such lines is more difficult.
-   ** If you are using colors to mark these lines, and rely on these,
-   ** you may \fIunset\fP this setting.
-   ** (Crypto only)
-   */
   {"crypt_verify_sig", DT_QUAD, R_NONE, OPT_VERIFYSIG, "yes" },
   /*
    ** .pp
@@ -1648,22 +1631,6 @@ struct option_t MuttVars[] = {
    ** (Note that this variable can be overridden by unsetting $$crypt_autosmime.)
    ** (S/MIME only)
    */
-  {"smime_ask_cert_label", DT_BOOL, R_NONE, OPTASKCERTLABEL, "yes" },
-  /*
-   ** .pp
-   ** This flag controls whether you want to be asked to enter a label
-   ** for a certificate about to be added to the database or not. It is
-   ** \fIset\fP by default.
-   ** (S/MIME only)
-   */
-  {"smime_decrypt_use_default_key", DT_BOOL, R_NONE, OPTSDEFAULTDECRYPTKEY, "yes" },
-  /*
-   ** .pp
-   ** If \fIset\fP (default) this tells Madmutt to use the default key for decryption. Otherwise,
-   ** if manage multiple certificate-key-pairs, Madmutt will try to use the mailbox-address
-   ** to determine the key to use. It will ask you to supply a key, if it can't find one.
-   ** (S/MIME only)
-   */
   {"pgp_entry_format", DT_STR, R_NONE, UL &PgpEntryFormat, "%4n %t%f %4l/0x%k %-4a %2c %u"},
   /*
    ** .pp
@@ -1685,14 +1652,6 @@ struct option_t MuttVars[] = {
    ** .pp
    ** (PGP only)
    */
-  {"pgp_check_exit", DT_BOOL, R_NONE, OPTPGPCHECKEXIT, "yes" },
-  /*
-   ** .pp
-   ** If \fIset\fP, Madmutt will check the exit code of the PGP subprocess when
-   ** signing or encrypting.  A non-zero exit code means that the
-   ** subprocess failed.
-   ** (PGP only)
-   */
   {"pgp_long_ids", DT_BOOL, R_NONE, OPTPGPLONGIDS, "no" },
   /*
    ** .pp