Add efficient bit-fields manipulations.

[apps/madmutt.git] / browser.c

diff --git a/browser.c b/browser.c
index aa91a60..f6ebc08 100644 (file)
--- a/browser.c
+++ b/browser.c
@@ -639,12 +639,12 @@ static void folder_entry (char *s, ssize_t slen, MUTTMENU * menu, int num)
 
 #ifdef USE_NNTP
   if (option (OPTNEWS))
-    m_strformat(s, slen, COLS - SW, GroupFormat, newsgroup_format_str, &folder,
-                option(OPTARROWCURSOR) ? M_FORMAT_ARROWCURSOR : 0);
+    m_strformat(s, slen, COLS - SW, GroupFormat, newsgroup_format_str,
+                &folder, 0);
   else
 #endif
-    m_strformat(s, slen, COLS - SW, FolderFormat, folder_format_str, &folder,
-               option(OPTARROWCURSOR) ? M_FORMAT_ARROWCURSOR : 0);
+    m_strformat(s, slen, COLS - SW, FolderFormat, folder_format_str,
+                &folder, 0);
 }
 
 static void init_menu (struct browser_state *state, MUTTMENU * menu,
@@ -706,8 +706,8 @@ static int file_tag (MUTTMENU * menu, int n, int m)
   return ff->tagged - ot;
 }
 
-void _mutt_select_file (char *f, ssize_t flen, int flags, char ***files,
-                        int *numfiles)
+void mutt_select_file (char *f, ssize_t flen, int flags, char ***files,
+                       int *numfiles)
 {
   char buf[_POSIX_PATH_MAX];
   char prefix[_POSIX_PATH_MAX] = "";
@@ -926,7 +926,7 @@ void _mutt_select_file (char *f, ssize_t flen, int flags, char ***files,
             /* try to restore the old values */
             m_strcpy(LastDir, sizeof(LastDir), OldLastDir);
             if (examine_directory (menu, &state, LastDir, prefix) == -1) {
-              m_strcpy(LastDir, sizeof(LastDir), NONULL(MCore.homedir));
+              m_strcpy(LastDir, sizeof(LastDir), NONULL(mod_core.homedir));
               goto bail;
             }
           }