X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=recvcmd.c;h=28cfc165288bf7695659af8191f7475c3f3d3628;hp=289b580d2f3788ace7bfcfad6f782fa7eb74e84a;hb=cc8910fb496d58eb30e116d06a0a01dde4dc944c;hpb=f2ff91d8b7627e22af9715d384b6f9e9e802a39e

diff --git a/recvcmd.c b/recvcmd.c
index 289b580..28cfc16 100644
--- a/recvcmd.c
+++ b/recvcmd.c
@@ -155,7 +155,6 @@ void mutt_attach_bounce (FILE * fp, HEADER * hdr __attribute__ ((unused)),
   buf[0] = 0;
   rfc822_addrcat(buf, sizeof(buf), adr, 1);
 
-#define extra_space (15+7+2)
   /*
    * See commands.c.
    */
@@ -163,7 +162,8 @@ void mutt_attach_bounce (FILE * fp, HEADER * hdr __attribute__ ((unused)),
             (p ? _("Bounce message to %s") : _("Bounce messages to %s")),
             buf);
 
-  if (mutt_strwidth (prompt) > COLS - extra_space) {
+#define extra_space (15+7+2)
+  if (m_strwidth(prompt) > COLS - extra_space) {
     mutt_format_string (prompt, sizeof (prompt) - 4,
                         0, COLS - extra_space, 0, 0,
                         prompt, sizeof (prompt), 0);
@@ -171,6 +171,7 @@ void mutt_attach_bounce (FILE * fp, HEADER * hdr __attribute__ ((unused)),
   } else {
     m_strcat(prompt, sizeof(prompt), "?");
   }
+#undef extra_space
 
   if (query_quadoption (OPT_BOUNCE, prompt) != M_YES) {
     address_list_wipe(&adr);
@@ -294,7 +295,7 @@ static void include_header (int quote, FILE * ifp,
                             HEADER * hdr, FILE * ofp, char *_prefix)
 {
   int chflags = CH_DECODE;
-  char prefix[SHORT_STRING];
+  char prefix[STRING];
 
   if (option (OPTWEED))
     chflags |= CH_WEED | CH_REORDER;
@@ -440,7 +441,7 @@ static void attach_forward_bodies (FILE * fp, HEADER * hdr,
   tmphdr->env = envelope_new();
   mutt_make_forward_subject (tmphdr->env, Context, parent);
 
-  tmpfp = m_tempfile(tmpbody, sizeof(tmpbody), NONULL(Tempdir), NULL);
+  tmpfp = m_tempfile(tmpbody, sizeof(tmpbody), NONULL(mod_core.tmpdir), NULL);
   if (!tmpfp) {
     mutt_error(_("Could not create temporary file"));
     return;
@@ -602,7 +603,7 @@ static void attach_forward_msgs (FILE * fp, HEADER * hdr __attribute__ ((unused)
 
     /* no MIME encapsulation */
 
-    tmpfp = m_tempfile(tmpbody, sizeof(tmpbody), NONULL(Tempdir), NULL);
+    tmpfp = m_tempfile(tmpbody, sizeof(tmpbody), NONULL(mod_core.tmpdir), NULL);
     if (!tmpfp) {
       mutt_error(_("Could not create temporary file"));
       header_delete(&tmphdr);
@@ -794,7 +795,6 @@ static void attach_include_reply (FILE * fp, FILE * tmpfp, HEADER * cur,
   }
 
   _mutt_copy_message (tmpfp, fp, cur, cur->content, cmflags, chflags);
-  mutt_make_post_indent (Context, cur, tmpfp);
 }
 
 void mutt_attach_reply (FILE * fp, HEADER * hdr,
@@ -811,7 +811,7 @@ void mutt_attach_reply (FILE * fp, HEADER * hdr,
   char tmpbody[_POSIX_PATH_MAX];
   FILE *tmpfp;
 
-  char prefix[SHORT_STRING];
+  char prefix[STRING];
   int rc;
 
 #ifdef USE_NNTP
@@ -850,7 +850,7 @@ void mutt_attach_reply (FILE * fp, HEADER * hdr,
     return;
   }
 
-  tmpfp = m_tempfile(tmpbody, sizeof(tmpbody), NONULL(Tempdir), NULL);
+  tmpfp = m_tempfile(tmpbody, sizeof(tmpbody), NONULL(mod_core.tmpdir), NULL);
   if (!tmpfp) {
     mutt_error(_("Could not create temporary file"));
     header_delete(&tmphdr);
@@ -906,8 +906,6 @@ void mutt_attach_reply (FILE * fp, HEADER * hdr,
       }
     }
 
-    mutt_make_post_indent (Context, parent, tmpfp);
-
     if (mime_reply_any && !cur &&
         copy_problematic_attachments (fp, &tmphdr->content, idx, idxlen,
                                       0) == NULL) {