diff --git a/src/option.c b/src/option.c
index 03274a432c..91ea4138d3 100644
--- a/src/option.c
+++ b/src/option.c
@@ -5604,7 +5604,7 @@ win_copy_options(win_T *wp_from, win_T *wp_to)
  * After copying window options: update variables depending on options.
  */
     void
-after_copy_winopt(win_T *wp UNUSED)
+after_copy_winopt(win_T *wp)
 {
 #ifdef FEAT_LINEBREAK
     briopt_check(wp);
diff --git a/src/version.c b/src/version.c
index 2476818eb5..1fc3bc64f2 100644
--- a/src/version.c
+++ b/src/version.c
@@ -750,6 +750,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    4355,
 /**/
     4354,
 /**/
diff --git a/src/window.c b/src/window.c
index 4fb92e035d..b2f01f67d3 100644
--- a/src/window.c
+++ b/src/window.c
@@ -1414,10 +1414,6 @@ win_init(win_T *newp, win_T *oldp, int flags UNUSED)
 #endif
 
     win_init_some(newp, oldp);
-
-#ifdef FEAT_SYN_HL
-    check_colorcolumn(newp);
-#endif
 #ifdef FEAT_TERMINAL
     term_update_wincolor(newp);
 #endif