#include "ascii.h"
#include "mutt_curses.h"
#include "rfc2047.h"
+#include "rfc3676.h"
#include "keymap.h"
#include "mime.h"
#include "copy.h"
FILE *tmpfp;
pid_t thepid;
+ if (SignOffString) {
+ fprintf (f, "\n%s", SignOffString);
+ }
+
if (Signature && (tmpfp = mutt_open_read (Signature, &thepid))) {
if (option (OPTSIGDASHES))
fputs ("\n-- \n", f);
+ else if (SignOffString)
+ fputs ("\n", f);
mutt_copy_stream (tmpfp, f);
fclose (tmpfp);
if (thepid != -1)
if (PostIndentString) {
mutt_make_string (buffer, sizeof (buffer), PostIndentString, ctx, cur);
fputs (buffer, out);
+ fputc ('\n', out);
}
}
msg->content->use_disp = 0;
msg->content->disposition = DISPINLINE;
if (option (OPTTEXTFLOWED) && msg->content->type == TYPETEXT
- && !ascii_strcasecmp (msg->content->subtype, "plain"))
+ && !ascii_strcasecmp (msg->content->subtype, "plain")) {
mutt_set_parameter ("format", "flowed", &msg->content->parameter);
+ if (option (OPTDELSP))
+ mutt_set_parameter ("delsp", "yes", &msg->content->parameter);
+ }
if (!tempfile) {
mutt_mktemp (buffer);
else
mutt_edit_file (Editor, msg->content->filename);
+ if (option (OPTTEXTFLOWED))
+ rfc3676_space_stuff (msg);
+
mutt_message_hook (NULL, msg, M_SEND2HOOK);
}
if (msg->content->next)
msg->content = mutt_make_multipart (msg->content);
+ if (mutt_attach_check (msg) &&
+ !msg->content->next &&
+ query_quadoption (OPT_ATTACH,
+ _("No attachments made but indicator found in text. "
+ "Cancel sending?")) == M_YES) {
+ if (quadoption (OPT_ATTACH) == M_YES) {
+ mutt_message _("No attachments made but indicator found in text. "
+ "Abort sending.");
+ sleep (2);
+ }
+ mutt_message (_("Mail not sent."));
+ goto main_loop;
+ }
+
/*
* Ok, we need to do it this way instead of handling all fcc stuff in
* one place in order to avoid going to main_loop with encoded "env"