diff src/optionstr.c @ 26022:30e60bfd5fb3 v8.2.3545

patch 8.2.3545: setcellwidths() may make 'listchars' or 'fillchars' invalid Commit: https://github.com/vim/vim/commit/94358a1e6e640ca5ebeb295efdddd4e92b700673 Author: zeertzjq <zeertzjq@outlook.com> Date: Wed Oct 20 11:01:15 2021 +0100 patch 8.2.3545: setcellwidths() may make 'listchars' or 'fillchars' invalid Problem: setcellwidths() may make 'listchars' or 'fillchars' invalid. Solution: Check the value and give an error. (closes https://github.com/vim/vim/issues/9024)
author Bram Moolenaar <Bram@vim.org>
date Wed, 20 Oct 2021 12:15:04 +0200
parents c8fcea636252
children 1d326bc99a09
line wrap: on
line diff
--- a/src/optionstr.c
+++ b/src/optionstr.c
@@ -871,7 +871,7 @@ did_set_string_option(
 	if (check_opt_strings(p_ambw, p_ambw_values, FALSE) != OK)
 	    errmsg = e_invarg;
 	else if (set_chars_option(curwin, &p_fcs) != NULL)
-	    errmsg = _("E835: Conflicts with value of 'fillchars'");
+	    errmsg = _(e_conflicts_with_value_of_fillchars);
 	else
 	{
 	    tabpage_T	*tp;
@@ -881,7 +881,7 @@ did_set_string_option(
 	    {
 		if (set_chars_option(wp, &wp->w_p_lcs) != NULL)
 		{
-		    errmsg = _("E834: Conflicts with value of 'listchars'");
+		    errmsg = _(e_conflicts_with_value_of_listchars);
 		    goto ambw_end;
 		}
 	    }