patch 9.1.0804: tests: no error check when setting global 'cc'
Problem: tests: no error check when setting global 'cc'
Solution: also parse and check global 'cc' value (Milly)
closes: #15914
Signed-off-by: Milly <milly.ca@gmail.com>
Signed-off-by: Christian Brabandt <cb@256bit.org>
diff --git a/src/window.c b/src/window.c
index db907f8..5a8dc2e 100644
--- a/src/window.c
+++ b/src/window.c
@@ -7925,23 +7925,38 @@
}
/*
- * Handle setting 'colorcolumn' or 'textwidth' in window "wp".
+ * Check "cc" as 'colorcolumn' and update the members of "wp".
+ * This is called when 'colorcolumn' or 'textwidth' is changed.
* Returns error message, NULL if it's OK.
*/
char *
-check_colorcolumn(win_T *wp)
+check_colorcolumn(
+ char_u *cc, // when NULL: use "wp->w_p_cc"
+ win_T *wp) // when NULL: only parse "cc"
{
char_u *s;
+ int tw;
int col;
int count = 0;
int color_cols[256];
int i;
int j = 0;
- if (wp->w_buffer == NULL)
+ if (wp != NULL && wp->w_buffer == NULL)
return NULL; // buffer was closed
- for (s = wp->w_p_cc; *s != NUL && count < 255;)
+ if (cc != NULL)
+ s = cc;
+ else
+ s = wp->w_p_cc;
+
+ if (wp != NULL)
+ tw = wp->w_buffer->b_p_tw;
+ else
+ // buffer-local value not set, assume zero
+ tw = 0;
+
+ while (*s != NUL && count < 255)
{
if (*s == '-' || *s == '+')
{
@@ -7951,9 +7966,9 @@
if (!VIM_ISDIGIT(*s))
return e_invalid_argument;
col = col * getdigits(&s);
- if (wp->w_buffer->b_p_tw == 0)
+ if (tw == 0)
goto skip; // 'textwidth' not set, skip this item
- col += wp->w_buffer->b_p_tw;
+ col += tw;
if (col < 0)
goto skip;
}
@@ -7971,6 +7986,9 @@
return e_invalid_argument; // illegal trailing comma as in "set cc=80,"
}
+ if (wp == NULL)
+ return NULL; // only parse "cc"
+
vim_free(wp->w_p_cc_cols);
if (count == 0)
wp->w_p_cc_cols = NULL;