X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=postpone.c;h=165438dea7b88dffa77639e586b559ed5d58f85d;hp=62939a8199b815210f5fd90decf6c9cb4776a72c;hb=68d6b380767702ba11529357f36d178d0dc4cb1e;hpb=1d0ce70b85c36973b50e5783fe7b72941c81c0a9

diff --git a/postpone.c b/postpone.c
index 62939a8..165438d 100644
--- a/postpone.c
+++ b/postpone.c
@@ -135,14 +135,14 @@ static void post_entry (char *s, ssize_t slen, MUTTMENU * menu, int entry)
   CONTEXT *ctx = (CONTEXT *) menu->data;
 
   _mutt_make_string (s, slen, NONULL (HdrFmt), ctx, ctx->hdrs[entry],
-                     M_FORMAT_ARROWCURSOR);
+                     option(OPTARROWCURSOR) ? M_FORMAT_ARROWCURSOR : 0);
 }
 
 static HEADER *select_msg (void)
 {
   MUTTMENU *menu;
   int i, done = 0, r = -1;
-  char helpstr[SHORT_STRING];
+  char helpstr[STRING];
   short orig_sort;
 
   menu = mutt_new_menu ();
@@ -589,18 +589,15 @@ int mutt_prepare_template (FILE * fp, CONTEXT * ctx, HEADER * newhdr,
     s.flags = 0;
 
     if (b->type == TYPETEXT) {
-      if (!ascii_strcasecmp
-          ("yes", parameter_getval(b->parameter, "x-mutt-noconv")))
-        b->noconv = 1;
-      else {
+      b->noconv = !ascii_strcasecmp("yes", parameter_getval(b->parameter,
+                                                            "x-mutt-noconv"));
+      if (b->noconv)
         s.flags |= M_CHARCONV;
-        b->noconv = 0;
-      }
 
       parameter_delval(&b->parameter, "x-mutt-noconv");
     }
 
-    s.fpout = m_tempfile(file, sizeof(file), NONULL(Tempdir), file);
+    s.fpout = m_tempfile(file, sizeof(file), NONULL(MCore.tmpdir), file);
     if (!s.fpout)
       goto bail;