From 8ca29b6a3599b82b8822b7697cad63d0244c2d59 Mon Sep 17 00:00:00 2001 From: zeertzjq Date: Tue, 9 Aug 2022 12:53:14 +0100 Subject: patch 9.0.0176: checking character options is duplicated and incomplete Problem: Checking character options is duplicated and incomplete. Solution: Move checking to check_chars_options(). (closes #10863) --- src/mbyte.c | 28 +++------------------------- 1 file changed, 3 insertions(+), 25 deletions(-) (limited to 'src/mbyte.c') diff --git a/src/mbyte.c b/src/mbyte.c index 691c1608e..941411b4a 100644 --- a/src/mbyte.c +++ b/src/mbyte.c @@ -5645,31 +5645,9 @@ f_setcellwidths(typval_T *argvars, typval_T *rettv UNUSED) cw_table = table; cw_table_size = l->lv_len; - // Check that the new value does not conflict with 'fillchars' or - // 'listchars'. - if (set_chars_option(curwin, &p_fcs, FALSE) != NULL) - error = e_conflicts_with_value_of_fillchars; - else if (set_chars_option(curwin, &p_lcs, FALSE) != NULL) - error = e_conflicts_with_value_of_listchars; - else - { - tabpage_T *tp; - win_T *wp; - - FOR_ALL_TAB_WINDOWS(tp, wp) - { - 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, FALSE) != NULL) - { - error = e_conflicts_with_value_of_fillchars; - break; - } - } - } + // Check that the new value does not conflict with 'listchars' or + // 'fillchars'. + error = check_chars_options(); if (error != NULL) { emsg(_(error)); -- cgit v1.2.1