always enable NLS, screw'em

[apps/madmutt.git] / recvcmd.c

diff --git a/recvcmd.c b/recvcmd.c
index 4ab7a87..e0c8457 100644 (file)
--- 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,6 +162,7 @@ void mutt_attach_bounce (FILE * fp, HEADER * hdr __attribute__ ((unused)),
             (p ? _("Bounce message to %s") : _("Bounce messages to %s")),
             buf);
 
+#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,
@@ -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);
@@ -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,
@@ -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) {