#include "alias.h"
#include "keymap.h"
#include "copy.h"
-#include <lib-crypt/crypt.h>
+#include "crypt.h"
#include "mutt_idna.h"
#include "attach.h"
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)
else if (i == -1)
return -1;
}
- else if (flags & SENDKEY) {
- BODY *btmp;
-
- if ((btmp = crypt_pgp_make_key_attachment (NULL)) == NULL)
- return -1;
-
- btmp->next = msg->content;
- msg->content = btmp;
- }
mutt_clear_error ();
address_list_wipe(&msg->env->from);
}
- if (!(flags & (SENDKEY | SENDPOSTPONED | SENDRESEND))) {
+ if (!(flags & (SENDPOSTPONED | SENDRESEND))) {
pbody = body_new();
pbody->next = msg->content; /* don't kill command-line attachments */
msg->content = pbody;
&& generate_body (tempfp, msg, flags, ctx, cur) == -1)
goto cleanup;
- if (!(flags & SENDKEY))
- append_signature (tempfp);
+ append_signature (tempfp);
/*
* this wants to be done _after_ generate_body, so message-hooks
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) {
/*
&& !(flags & (SENDRESEND | SENDPOSTPONED)))
msg->env->from->personal = m_strdup(Realname);
- if (!(flags & SENDKEY))
- m_fclose(&tempfp);
+ m_fclose(&tempfp);
if (!(flags & SENDBATCH)) {
struct stat st;
* setting of $forward_edit because the user probably needs to add the
* recipients.
*/
- if (!(flags & SENDKEY) &&
- ((flags & SENDFORWARD) == 0 ||
+ if (((flags & SENDFORWARD) == 0 ||
(option (OPTEDITHDRS) && option (OPTAUTOEDIT)) ||
query_quadoption (OPT_FORWEDIT,
- _("Edit forwarded message?")) == M_YES)) {
+ _("Edit forwarded message?")) == M_YES))
+ {
/* If the this isn't a text message, look for a mailcap edit command */
if (rfc1524_mailcap_isneeded(msg->content)) {
if (!mutt_edit_attachment (msg->content))
mutt_message_hook (NULL, msg, M_SEND2HOOK);
}
- if (!(flags & (SENDPOSTPONED | SENDFORWARD | SENDKEY | SENDRESEND))) {
+ if (!(flags & (SENDPOSTPONED | SENDFORWARD | SENDRESEND))) {
if (stat (msg->content->filename, &st) == 0) {
/* if the file was not modified, bail out now */
if (mtime == st.st_mtime && !msg->content->next &&