X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=send.c;h=2da13d7fef71f1465d062418b88ebd9e7c5b6461;hp=f786e5c137e0938eebe726af65e407c7b268c696;hb=132d06d5920f9a496a8623acfbbabe9739618489;hpb=82589516e2473b5451218d7b00a9dfbc3e18f3ca diff --git a/send.c b/send.c index f786e5c..2da13d7 100644 --- a/send.c +++ b/send.c @@ -97,7 +97,7 @@ static void append_signature (FILE * f) fprintf (f, "\n%s", SignOffString); } - if (tmpfp = mutt_open_read(NONULL(MAlias.signature), &thepid)) { + if ((tmpfp = mutt_open_read(NONULL(MAlias.signature), &thepid))) { if (option (OPTSIGDASHES)) fputs ("\n-- \n", f); else if (SignOffString) @@ -1363,12 +1363,6 @@ int ci_send_message (int flags, /* send mode */ if (option (OPTCRYPTREPLYSIGNENCRYPTED) && cur && (cur->security & ENCRYPT)) msg->security |= SIGN; - if (msg->security & (ENCRYPT | SIGN)) { - if (option (OPTPGPAUTOINLINE)) - msg->security |= INLINE; - if (option (OPTPGPREPLYINLINE) && cur && (cur->security & INLINE)) - msg->security |= INLINE; - } if (msg->security) { /*