summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/option.c3
-rw-r--r--src/version.c2
2 files changed, 5 insertions, 0 deletions
diff --git a/src/option.c b/src/option.c
index 4db302714..977d83802 100644
--- a/src/option.c
+++ b/src/option.c
@@ -7036,6 +7036,9 @@ check_colorcolumn(wp)
int i;
int j = 0;
+ if (wp->w_buffer == NULL)
+ return NULL; /* buffer was closed */
+
for (s = wp->w_p_cc; *s != NUL && count < 255;)
{
if (*s == '-' || *s == '+')
diff --git a/src/version.c b/src/version.c
index d0e649c33..d67e8d845 100644
--- a/src/version.c
+++ b/src/version.c
@@ -710,6 +710,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 316,
+/**/
315,
/**/
314,