diff --git a/src/charset.c b/src/charset.c
index 0535d4cfca..cc02563b29 100644
--- a/src/charset.c
+++ b/src/charset.c
@@ -1218,6 +1218,8 @@ in_win_border(wp, vcol)
     if ((int)vcol == width1 - 1)
 	return TRUE;
     width2 = width1 + win_col_off2(wp);
+    if (width2 <= 0)
+	return FALSE;
     return ((vcol - width1) % width2 == width2 - 1);
 }
 #endif /* FEAT_MBYTE */
diff --git a/src/version.c b/src/version.c
index 1a7e765271..a1e052c4dd 100644
--- a/src/version.c
+++ b/src/version.c
@@ -676,6 +676,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    267,
 /**/
     266,
 /**/