Users don't know what they are doing most of the time…

Signed-off-by: Pierre Habouzit <madcoder@debian.org>

diff --git a/init.h b/init.h
index f96845e..89eba35 100644 (file)
--- a/init.h
+++ b/init.h
@@ -1340,19 +1340,6 @@ struct option_t MuttVars[] = {
    ** menu, attachments which cannot be decoded in a reasonable manner will
    ** be attached to the newly composed message if this option is set.
    */
    ** menu, attachments which cannot be decoded in a reasonable manner will
    ** be attached to the newly composed message if this option is set.
    */

-#ifdef USE_NNTP
-  {"nntp_mime_subject", DT_BOOL, R_NONE, OPTMIMESUBJECT, "yes" },
-  /*
-   ** .pp
-   ** Availability: NNTP
-   **
-   ** .pp
-   ** If \fIunset\fP, an 8-bit ``\fTSubject:\fP'' header field in a news article
-   ** will not be encoded according to RFC2047.
-   ** .pp
-   ** \fBNote:\fP Only change this setting if you know what you are doing.
-   */
-#endif

   {"mix_entry_format", DT_STR, R_NONE, UL &MixEntryFormat, "%4n %c %-16s %a"},
   /*
    ** .pp
   {"mix_entry_format", DT_STR, R_NONE, UL &MixEntryFormat, "%4n %c %-16s %a"},
   /*
    ** .pp


@@ -1820,15 +1807,6 @@ struct option_t MuttVars[] = {
    ** keyid form to specify your key (e.g., ``\fT0x00112233\fP'').
    ** (PGP only)
    */
    ** keyid form to specify your key (e.g., ``\fT0x00112233\fP'').
    ** (PGP only)
    */

-  {"pgp_strict_enc", DT_BOOL, R_NONE, OPTPGPSTRICTENC, "yes" },
-  /*
-   ** .pp
-   ** If \fIset\fP, Madmutt will automatically encode PGP/MIME signed messages as
-   ** \fTquoted-printable\fP.  Please note that unsetting this variable may
-   ** lead to problems with non-verifyable PGP signatures, so only change
-   ** this if you know what you are doing.
-   ** (PGP only)
-   */

   {"pgp_timeout", DT_NUM, R_NONE, UL &PgpTimeout, "300" },
   /*
    ** .pp
   {"pgp_timeout", DT_NUM, R_NONE, UL &PgpTimeout, "300" },
   /*
    ** .pp


@@ -2784,14 +2762,6 @@ struct option_t MuttVars[] = {
    ** For example, Madmutt has the ability to highlight
    ** the signature in a different color in the builtin pager.
    */
    ** For example, Madmutt has the ability to highlight
    ** the signature in a different color in the builtin pager.
    */

-  {"sig_on_top", DT_BOOL, R_NONE, OPTSIGONTOP, "no" },
-  /*
-   ** .pp
-   ** If \fIset\fP, the signature will be included before any quoted or forwarded
-   ** text.  It is \fBstrongly\fP recommended that you do not set this variable
-   ** unless you really know what you are doing, and are prepared to take
-   ** some heat from netiquette guardians.
-   */

   {"signature", DT_PATH, R_NONE, UL &Signature, "~/.signature"},
   /*
    ** .pp
   {"signature", DT_PATH, R_NONE, UL &Signature, "~/.signature"},
   /*
    ** .pp

diff --git a/lib-crypt/crypt.c b/lib-crypt/crypt.c
index 99728dc..f8cf471 100644 (file)
--- a/lib-crypt/crypt.c
+++ b/lib-crypt/crypt.c
@@ -299,9 +299,9 @@ void convert_to_7bit (BODY * a)
       if (a->encoding != ENC7BIT) {
         a->encoding = ENC7BIT;
         convert_to_7bit (a->parts);
       if (a->encoding != ENC7BIT) {
         a->encoding = ENC7BIT;
         convert_to_7bit (a->parts);

-      }
-      else if (option (OPTPGPSTRICTENC))
+      } else {

         convert_to_7bit (a->parts);
         convert_to_7bit (a->parts);

+      }

     }
     else if (a->type == TYPEMESSAGE &&
              m_strcasecmp(a->subtype, "delivery-status")) {
     }
     else if (a->type == TYPEMESSAGE &&
              m_strcasecmp(a->subtype, "delivery-status")) {


@@ -313,8 +313,7 @@ void convert_to_7bit (BODY * a)
     else if (a->encoding == ENCBINARY)
       a->encoding = ENCBASE64;
     else if (a->content && a->encoding != ENCBASE64 &&
     else if (a->encoding == ENCBINARY)
       a->encoding = ENCBASE64;
     else if (a->content && a->encoding != ENCBASE64 &&

-             (a->content->from || (a->content->space &&
-                                   option (OPTPGPSTRICTENC))))
+             (a->content->from || a->content->space))

       a->encoding = ENCQUOTEDPRINTABLE;
     a = a->next;
   }
       a->encoding = ENCQUOTEDPRINTABLE;
     a = a->next;
   }

diff --git a/mutt.h b/mutt.h
index ed3a739..ba273ef 100644 (file)
--- a/mutt.h
+++ b/mutt.h
@@ -282,9 +282,6 @@ enum {
   OPTMETOO,
   OPTMHPURGE,
   OPTMIMEFORWDECODE,
   OPTMETOO,
   OPTMHPURGE,
   OPTMIMEFORWDECODE,

-#ifdef USE_NNTP
-  OPTMIMESUBJECT,               /* encode subject line with RFC2047 */
-#endif

   OPTNARROWTREE,
   OPTPAGERSTOP,
   OPTPIPEDECODE,
   OPTNARROWTREE,
   OPTPAGERSTOP,
   OPTPIPEDECODE,


@@ -307,7 +304,6 @@ enum {
   OPTSAVENAME,
   OPTSCORE,
   OPTSIGDASHES,
   OPTSAVENAME,
   OPTSCORE,
   OPTSIGDASHES,

-  OPTSIGONTOP,

   OPTSORTRE,
   OPTSPAMSEP,
   OPTSTATUSONTOP,
   OPTSORTRE,
   OPTSPAMSEP,
   OPTSTATUSONTOP,


@@ -358,7 +354,6 @@ enum {
   OPTPGPLONGIDS,
   OPTPGPAUTODEC,
   OPTPGPRETAINABLESIG,
   OPTPGPLONGIDS,
   OPTPGPAUTODEC,
   OPTPGPRETAINABLESIG,

-  OPTPGPSTRICTENC,

   OPTFORWDECRYPT,
   OPTPGPSHOWUNUSABLE,
   OPTPGPAUTOINLINE,
   OPTFORWDECRYPT,
   OPTPGPSHOWUNUSABLE,
   OPTPGPAUTOINLINE,

diff --git a/send.c b/send.c
index 269d98d..4d5cd09 100644 (file)
--- a/send.c
+++ b/send.c
@@ -1349,16 +1349,12 @@ int ci_send_message (int flags, /* send mode */
     if (option (OPTHDRS))
       process_user_header (msg->env);
 
     if (option (OPTHDRS))
       process_user_header (msg->env);
 

-
-    if (option (OPTSIGONTOP) && (!(flags & SENDKEY)))
-      append_signature (tempfp);
-

     /* include replies/forwarded messages, unless we are given a template */
     if (!tempfile && (ctx || !(flags & (SENDREPLY | SENDFORWARD)))
         && generate_body (tempfp, msg, flags, ctx, cur) == -1)
       goto cleanup;
 
     /* include replies/forwarded messages, unless we are given a template */
     if (!tempfile && (ctx || !(flags & (SENDREPLY | SENDFORWARD)))
         && generate_body (tempfp, msg, flags, ctx, cur) == -1)
       goto cleanup;
 

-    if (!option (OPTSIGONTOP) && (!(flags & SENDKEY)))
+    if (!(flags & SENDKEY))

       append_signature (tempfp);
 
     /* 
       append_signature (tempfp);
 
     /* 

diff --git a/sendlib.c b/sendlib.c
index e45ad11..a81949c 100644 (file)
--- a/sendlib.c
+++ b/sendlib.c
@@ -1977,12 +1977,7 @@ void mutt_prepare_envelope (ENVELOPE * env, int final)
   rfc2047_encode_adrlist(env->reply_to, "Reply-To");
 
   if (env->subject)
   rfc2047_encode_adrlist(env->reply_to, "Reply-To");
 
   if (env->subject)

-#ifdef USE_NNTP
-    if (!option (OPTNEWSSEND) || option (OPTMIMESUBJECT))
-#endif
-    {
-      rfc2047_encode_string (&env->subject);
-    }
+    rfc2047_encode_string (&env->subject);

   encode_headers (env->userhdrs);
 }
 
   encode_headers (env->userhdrs);
 }