X-Git-Url: http://git.madism.org/?a=blobdiff_plain;f=lib-crypt%2Fcrypt-gpgme.c;h=7b85ab6c7770f08f6a2b40334de7254f5c81eab1;hb=27c3007f2cfb52db5a357eaa2a8313a5ab03c93d;hp=e295042219828689519a923a1569955e528d3751;hpb=688ac22f746f785c27ac99ac86aa85a3035a3638;p=apps%2Fmadmutt.git

diff --git a/lib-crypt/crypt-gpgme.c b/lib-crypt/crypt-gpgme.c
index e295042..7b85ab6 100644
--- a/lib-crypt/crypt-gpgme.c
+++ b/lib-crypt/crypt-gpgme.c
@@ -2309,9 +2309,9 @@ crypt_entry_fmt (char *dest, ssize_t destlen, char op,
   }
 
   if (optional)
-    mutt_FormatString (dest, destlen, ifstring, mutt_attach_fmt, data, 0);
+    m_strformat (dest, destlen, ifstring, mutt_attach_fmt, data, 0);
   else if (flags & M_FORMAT_OPTIONAL)
-    mutt_FormatString (dest, destlen, elsestring, mutt_attach_fmt, data, 0);
+    m_strformat (dest, destlen, elsestring, mutt_attach_fmt, data, 0);
   return (src);
 }
 
@@ -2324,8 +2324,9 @@ static void crypt_entry (char *s, ssize_t l, MUTTMENU * menu, int num)
   entry.key = key_table[num];
   entry.num = num + 1;
 
-  mutt_FormatString (s, l, NONULL (PgpEntryFormat), crypt_entry_fmt,
-                     (unsigned long) &entry, M_FORMAT_ARROWCURSOR);
+  m_strformat(s, l, NONULL (PgpEntryFormat), crypt_entry_fmt,
+              (unsigned long) &entry,
+              option(OPTARROWCURSOR) ? M_FORMAT_ARROWCURSOR : 0);
 }
 
 /* Compare two addresses and the keyid to be used for sorting. */