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);
}
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);
#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,
/* 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(Homedir));
+ m_strcpy(LastDir, sizeof(LastDir), NONULL(mod_core.homedir));
goto bail;
}
}
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 */
s = vskipspaces(s);
if (*s == '!') {
s = vskipspaces(s + 1);
- not = 1;
+ neg = 1;
}
if ((err = REGCOMP (rx, s, REG_NOSUB)) != 0) {
regfree (Mask.rx);
p_delete(&Mask.rx);
Mask.rx = rx;
- Mask.not = not;
+ Mask.neg = neg;
destroy_state (&state);
if (state.imap_browse) {