blackbeard420/weechat
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fset: only mark/unmark matching options with "m:" and "u:", do not toggle mark on non-matching options

Browse Source
This commit is contained in:
Sébastien Helleu 2017-06-17 14:55:16 +02:00
parent 70f71be108
commit 5acf4ba574
1 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/plugins/fset/fset-option.c
View File

@ -1200,7 +1200,7 @@ fset_option_toggle_mark (struct t_fset_option *fset_option,
void
fset_option_mark_options_matching_filter (const char *filter, int mark)
{
int num_options, i, mark_old;
int num_options, i, mark_old, matching;
struct t_fset_option *ptr_fset_option;
num_options = weechat_arraylist_size (fset_options);
@ -1210,12 +1210,20 @@ fset_option_mark_options_matching_filter (const char *filter, int mark)
if (ptr_fset_option)
{
mark_old = ptr_fset_option->marked;
if (fset_option_match_filter (ptr_fset_option, filter))
ptr_fset_option->marked = mark;
else
ptr_fset_option->marked = mark ^ 1;
if (mark_old != ptr_fset_option->marked)
fset_option_count_marked += (ptr_fset_option->marked) ? 1 : -1;
matching = fset_option_match_filter (ptr_fset_option, filter);
if (matching)
{
if (!mark_old && mark)
{
ptr_fset_option->marked = 1;
fset_option_count_marked++;
}
else if (mark_old && !mark)
{
ptr_fset_option->marked = 0;
fset_option_count_marked--;
}
}
}
}
fset_buffer_refresh (0);