X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=browser.c;h=4af5dcad56b15c114d4f0454c7dc5be4718072f0;hp=43b1b3430e49cad58a93c3be8956468ad9f87f5f;hb=27c3007f2cfb52db5a357eaa2a8313a5ab03c93d;hpb=f3cbb9f51357972f6e74244494236a41dc4d84cd

diff --git a/browser.c b/browser.c
index 43b1b34..4af5dca 100644
--- a/browser.c
+++ b/browser.c
@@ -151,7 +151,7 @@ static const char *folder_format_str (char *dest, ssize_t destlen, char op,
                                       const char *elsestring,
                                       unsigned long data, format_flag flags)
 {
-  char fn[SHORT_STRING], tmp[SHORT_STRING], permission[11], date[16];
+  char fn[STRING], tmp[STRING], permission[11], date[16];
   const char *t_fmt;
   time_t tnow;
   FOLDER *folder = (FOLDER *) data;
@@ -301,9 +301,9 @@ static const char *folder_format_str (char *dest, ssize_t destlen, char op,
   }
 
   if (optional)
-    mutt_FormatString (dest, destlen, ifstring, folder_format_str, data, 0);
+    m_strformat (dest, destlen, ifstring, folder_format_str, data, 0);
   else if (flags & M_FORMAT_OPTIONAL)
-    mutt_FormatString (dest, destlen, elsestring, folder_format_str, data, 0);
+    m_strformat (dest, destlen, elsestring, folder_format_str, data, 0);
 
   return (src);
 }
@@ -316,7 +316,7 @@ static const char *newsgroup_format_str (char *dest, ssize_t destlen, char op,
                                          unsigned long data,
                                          format_flag flags)
 {
-  char fn[SHORT_STRING], tmp[SHORT_STRING];
+  char fn[STRING], tmp[STRING];
   FOLDER *folder = (FOLDER *) data;
 
   switch (op) {
@@ -350,10 +350,10 @@ static const char *newsgroup_format_str (char *dest, ssize_t destlen, char op,
   case 's':
     if (flags & M_FORMAT_OPTIONAL) {
       if (folder->ff->nd->unread != 0)
-        mutt_FormatString (dest, destlen, ifstring, newsgroup_format_str,
+        m_strformat (dest, destlen, ifstring, newsgroup_format_str,
                            data, flags);
       else
-        mutt_FormatString (dest, destlen, elsestring, newsgroup_format_str,
+        m_strformat (dest, destlen, elsestring, newsgroup_format_str,
                            data, flags);
     }
     else if (Context && Context->data == folder->ff->nd) {
@@ -480,7 +480,7 @@ static int examine_directory (MUTTMENU * menu, struct browser_state *state,
     struct stat s;
     DIR *dp;
     struct dirent *de;
-    char buffer[_POSIX_PATH_MAX + SHORT_STRING];
+    char buffer[_POSIX_PATH_MAX + STRING];
     int i = -1;
 
     while (stat (d, &s) == -1) {
@@ -645,12 +645,14 @@ static void folder_entry (char *s, ssize_t slen, MUTTMENU * menu, int num)
 
 #ifdef USE_NNTP
   if (option (OPTNEWS))
-    mutt_FormatString (s, slen, NONULL (GroupFormat), newsgroup_format_str,
-                       (unsigned long) &folder, M_FORMAT_ARROWCURSOR);
+    m_strformat(s, slen, NONULL (GroupFormat), newsgroup_format_str,
+                (unsigned long)&folder,
+                option(OPTARROWCURSOR) ? M_FORMAT_ARROWCURSOR : 0);
   else
 #endif
-    mutt_FormatString (s, slen, NONULL (FolderFormat), folder_format_str,
-                       (unsigned long) &folder, M_FORMAT_ARROWCURSOR);
+    m_strformat(s, slen, NONULL (FolderFormat), folder_format_str,
+               (unsigned long)&folder,
+               option(OPTARROWCURSOR) ? M_FORMAT_ARROWCURSOR : 0);
 }
 
 static void init_menu (struct browser_state *state, MUTTMENU * menu,
@@ -717,7 +719,7 @@ void _mutt_select_file (char *f, ssize_t flen, int flags, char ***files,
 {
   char buf[_POSIX_PATH_MAX];
   char prefix[_POSIX_PATH_MAX] = "";
-  char helpstr[SHORT_STRING];
+  char helpstr[STRING];
   char title[STRING];
   struct browser_state state;
   MUTTMENU *menu;
@@ -1054,7 +1056,7 @@ void _mutt_select_file (char *f, ssize_t flen, int flags, char ***files,
       if (!state.entry[menu->current].imap)
         mutt_error (_("Delete is only supported for IMAP mailboxes"));
       else {
-        char msg[SHORT_STRING];
+        char msg[STRING];
         IMAP_MBOX mx;
         int nentry = menu->current;