1
0
mirror of https://github.com/weechat/weechat.git synced 2026-07-03 00:03:12 +02:00

fset: rename ${value_with_parent} to ${value2}

This commit is contained in:
Sébastien Helleu
2017-05-28 14:01:46 +02:00
parent 8bace39142
commit f4169608d1
3 changed files with 8 additions and 10 deletions
+5 -7
View File
@@ -167,7 +167,7 @@ fset_buffer_display_line (int y, struct t_fset_option *fset_option)
weechat_hashtable_set (fset_buffer_hashtable_extra_vars,
"value", str_field);
/* value_with_parent */
/* value2 (value with parent value in case of inherited value) */
ptr_parent_value = weechat_hdata_string (fset_hdata_fset_option,
fset_option, "parent_value");
if (value_undef && ptr_parent_value)
@@ -188,10 +188,9 @@ fset_buffer_display_line (int y, struct t_fset_option *fset_option)
(ptr_parent_value) ? ptr_parent_value : FSET_OPTION_VALUE_NULL,
(add_quotes_parent) ? weechat_color (weechat_config_string (fset_config_color_quotes[selected_line])) : "",
(add_quotes_parent) ? "\"" : "");
fset_buffer_fills_field (str_field, sizeof (str_field),
"value_with_parent", 32);
fset_buffer_fills_field (str_field, sizeof (str_field), "value2", 32);
weechat_hashtable_set (fset_buffer_hashtable_extra_vars,
"value_with_parent", str_field);
"value2", str_field);
}
else
{
@@ -203,10 +202,9 @@ fset_buffer_display_line (int y, struct t_fset_option *fset_option)
(ptr_field) ? ptr_field : FSET_OPTION_VALUE_NULL,
(add_quotes) ? weechat_color (weechat_config_string (fset_config_color_quotes[selected_line])) : "",
(add_quotes) ? "\"" : "");
fset_buffer_fills_field (str_field, sizeof (str_field),
"value_with_parent", 32);
fset_buffer_fills_field (str_field, sizeof (str_field), "value2", 32);
weechat_hashtable_set (fset_buffer_hashtable_extra_vars,
"value_with_parent", str_field);
"value2", str_field);
}
/* set other variables depending on the value */
+1 -1
View File
@@ -181,7 +181,7 @@ fset_config_init ()
N_("format of each line with an option "
"(note: content is evaluated, see /help fset)"),
NULL, 0, 0,
" ${name} ${type} ${value_with_parent}",
" ${name} ${type} ${value2}",
NULL, 0,
NULL, NULL, NULL,
&fset_config_change_format, NULL, NULL,
+2 -2
View File
@@ -346,11 +346,11 @@ fset_option_set_max_length_fields_option (struct t_fset_option *fset_option)
}
fset_option_set_max_length_field ("parent_value", length_parent_value);
/* value_with_parent */
/* value2 */
length = length_value;
if (!fset_option->value)
length += 4 + length_parent_value;
fset_option_set_max_length_field ("value_with_parent", length);
fset_option_set_max_length_field ("value2", length);
}
/*