X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=browser.c;h=4ba6e19e361c7960783ba4b6744e6e03360c017b;hp=4a927d92fda3c6778a3e8a2dce0d922b6f805098;hb=c50162101b316e88b95dc4259d45a259b38a972e;hpb=558b0bd9de90a9dc28f409d8f46679bf48c72ded

diff --git a/browser.c b/browser.c
index 4a927d9..4ba6e19 100644
--- a/browser.c
+++ b/browser.c
@@ -462,7 +462,7 @@ static int examine_directory (MUTTMENU * menu, struct browser_state *state,
       nntp_sync_sidebar (data);
       if (m_strncmp (prefix, data->group, m_strlen(prefix)) != 0)
         continue;
-      if (!((regexec (Mask.rx, data->group, 0, NULL, 0) == 0) ^ Mask.not))
+      if (!((regexec (Mask.rx, data->group, 0, NULL, 0) == 0) ^ Mask.neg))
         continue;
       add_folder (menu, state, data->group, NULL, data, data->new);
     }
@@ -511,7 +511,7 @@ static int examine_directory (MUTTMENU * menu, struct browser_state *state,
 
       if (m_strncmp(prefix, de->d_name, m_strlen(prefix)) != 0)
         continue;
-      if (!((regexec (Mask.rx, de->d_name, 0, NULL, 0) == 0) ^ Mask.not))
+      if (!((regexec (Mask.rx, de->d_name, 0, NULL, 0) == 0) ^ Mask.neg))
         continue;
 
       mutt_concat_path(buffer, sizeof(buffer), d, de->d_name);
@@ -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,
@@ -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;
             }
           }
@@ -1144,7 +1144,7 @@ void _mutt_select_file (char *f, ssize_t flen, int flags, char ***files,
       if (mutt_get_field (_("File Mask: "), buf, sizeof (buf), 0) == 0) {
         regex_t *rx = p_new(regex_t, 1);
         char *s = buf;
-        int not = 0, err;
+        int neg = 0, err;
 
         buffy = 0;
         /* assume that the user wants to see everything */
@@ -1153,7 +1153,7 @@ void _mutt_select_file (char *f, ssize_t flen, int flags, char ***files,
         s = vskipspaces(s);
         if (*s == '!') {
           s = vskipspaces(s + 1);
-          not = 1;
+          neg = 1;
         }
 
         if ((err = REGCOMP (rx, s, REG_NOSUB)) != 0) {
@@ -1167,7 +1167,7 @@ void _mutt_select_file (char *f, ssize_t flen, int flags, char ***files,
           regfree (Mask.rx);
           p_delete(&Mask.rx);
           Mask.rx = rx;
-          Mask.not = not;
+          Mask.neg = neg;
 
           destroy_state (&state);
           if (state.imap_browse) {