commit 860cae1cec85aeb06668a2b071727c43869acf15
author Bram Moolenaar <Bram@vim.org> Sat Jun 05 23:22:07 2010 +0200
committer Bram Moolenaar <Bram@vim.org> Sat Jun 05 23:22:07 2010 +0200
tree 8f7b62b69f4a7d3340902178927bbc3f9d24cc3e
parent 945e2dbb633ed29b697a8d4eea51672e3c11143b

Add the conceal patch from Vince Negri.

src/window.c

diff --git a/src/window.c b/src/window.c
index 9071012..d6aae7c 100644
--- a/src/window.c
+++ b/src/window.c
@@ -1175,6 +1175,9 @@
     int		i;
 
     newp->w_buffer = oldp->w_buffer;
+#ifdef FEAT_SYN_HL
+    newp->w_s = oldp->w_s;
+#endif
     oldp->w_buffer->b_nwindows++;
     newp->w_cursor = oldp->w_cursor;
     newp->w_valid = 0;
@@ -3294,6 +3297,9 @@
 	if (curwin == NULL || curbuf == NULL)
 	    return FAIL;
 	curwin->w_buffer = curbuf;
+#ifdef FEAT_SYN_HL
+	curwin->w_s = &(curbuf->b_s);
+#endif
 	curbuf->b_nwindows = 1;	/* there is one window */
 #ifdef FEAT_WINDOWS
 	curwin->w_alist = &global_alist;
@@ -4401,10 +4407,16 @@
     }
 #endif /* FEAT_GUI */
 
+#ifdef FEAT_SYN_HL
+    /* free independent synblock */
+    if (wp->w_s != &wp->w_buffer->b_s)
+	vim_free(wp->w_s);
+#endif
+
 #ifdef FEAT_AUTOCMD
     if (wp != aucmd_win)
 #endif
-	win_remove(wp, tp);
+    win_remove(wp, tp);
     vim_free(wp);
 
 #ifdef FEAT_AUTOCMD