patch 9.0.0040: use of set_chars_option() is confusing
Problem: Use of set_chars_option() is confusing.
Solution: Add "apply" argument to store the result or not. Merge similar
code.
diff --git a/src/mbyte.c b/src/mbyte.c
index 1e3ef72..691c160 100644
--- a/src/mbyte.c
+++ b/src/mbyte.c
@@ -5647,9 +5647,9 @@
// Check that the new value does not conflict with 'fillchars' or
// 'listchars'.
- if (set_chars_option(curwin, &p_fcs) != NULL)
+ if (set_chars_option(curwin, &p_fcs, FALSE) != NULL)
error = e_conflicts_with_value_of_fillchars;
- else if (set_chars_option(curwin, &p_lcs) != NULL)
+ else if (set_chars_option(curwin, &p_lcs, FALSE) != NULL)
error = e_conflicts_with_value_of_listchars;
else
{
@@ -5658,12 +5658,12 @@
FOR_ALL_TAB_WINDOWS(tp, wp)
{
- if (set_chars_option(wp, &wp->w_p_lcs) != NULL)
+ if (set_chars_option(wp, &wp->w_p_lcs, FALSE) != NULL)
{
error = e_conflicts_with_value_of_listchars;
break;
}
- if (set_chars_option(wp, &wp->w_p_fcs) != NULL)
+ if (set_chars_option(wp, &wp->w_p_fcs, FALSE) != NULL)
{
error = e_conflicts_with_value_of_fillchars;
break;