X-Git-Url: http://git.madism.org/?a=blobdiff_plain;f=compose.c;h=d1a6098b12f305c9be6c934fde749fc2afe555bd;hb=27c3007f2cfb52db5a357eaa2a8313a5ab03c93d;hp=ec7ac1b942fe0283fe597ebb5c7e802b49622892;hpb=688ac22f746f785c27ac99ac86aa85a3035a3638;p=apps%2Fmadmutt.git

diff --git a/compose.c b/compose.c
index ec7ac1b..d1a6098 100644
--- a/compose.c
+++ b/compose.c
@@ -114,9 +114,9 @@ static struct mapping_t ComposeNewsHelp[] = {
 
 static void snd_entry (char *b, ssize_t blen, MUTTMENU * menu, int num) {
   int w=(COLS-SW)>blen?blen:COLS-SW;
-  mutt_FormatString (b, w, NONULL (AttachFormat), mutt_attach_fmt,
+  m_strformat (b, w, NONULL (AttachFormat), mutt_attach_fmt,
                      (unsigned long) (((ATTACHPTR **) menu->data)[num]),
-                     M_FORMAT_STAT_FILE | M_FORMAT_ARROWCURSOR);
+                     M_FORMAT_STAT_FILE | (option(OPTARROWCURSOR) ? M_FORMAT_ARROWCURSOR : 0));
 }
 
 static void redraw_crypt_lines (HEADER * msg)
@@ -461,8 +461,7 @@ static void compose_status_line (char *buf, ssize_t buflen, MUTTMENU * menu,
                                  const char *p)
 {
   int w=(COLS-SW)>buflen?buflen:(COLS-SW);
-  mutt_FormatString (buf, w, p, compose_format_str,
-                     (unsigned long) menu, 0);
+  m_strformat(buf, w, p, compose_format_str, (unsigned long)menu, 0);
 }
 
 /* return values: