Added 'colorcolumn' option.  Partly by Gregor Uhlenheuer.
diff --git a/src/window.c b/src/window.c
index c2590e5..2c780df 100644
--- a/src/window.c
+++ b/src/window.c
@@ -1225,6 +1225,10 @@
 # endif
 
     win_init_some(newp, oldp);
+
+# ifdef FEAT_SYN_HL
+    check_colorcolumn(newp);
+# endif
 }
 
 /*
@@ -4413,6 +4417,7 @@
 
 #ifdef FEAT_SYN_HL
     reset_synblock(wp);  /* free independent synblock */
+    vim_free(wp->w_p_cc_cols);
 #endif
 
 #ifdef FEAT_AUTOCMD