One more fix for conceal patch.
diff --git a/src/ex_cmds.c b/src/ex_cmds.c
index 2ffaa3e..53dc0ad 100644
--- a/src/ex_cmds.c
+++ b/src/ex_cmds.c
@@ -3571,9 +3571,6 @@
new_name = NULL;
#endif
buf_freeall(curbuf, FALSE, FALSE); /* free all things for buffer */
-#ifdef FEAT_SYN_HL
- reset_synblock(curwin); /* remove any ownsyntax */
-#endif
#ifdef FEAT_AUTOCMD
/* If autocommands deleted the buffer we were going to re-edit, give
* up and jump to the end. */
@@ -3618,6 +3615,10 @@
*/
check_arg_idx(curwin);
+#ifdef FEAT_SYN_HL
+ reset_synblock(curwin); /* remove any ownsyntax */
+#endif
+
#ifdef FEAT_AUTOCMD
if (!auto_buf)
#endif
diff --git a/src/gui_gtk_x11.c b/src/gui_gtk_x11.c
index 86cd59c..2db203b 100644
--- a/src/gui_gtk_x11.c
+++ b/src/gui_gtk_x11.c
@@ -4231,7 +4231,7 @@
#ifdef HAVE_GTK2
/* For GTK2 changing the size of the form widget doesn't cause window
* resizing. */
- if (gtk_socket_id == 0)
+ if (gtk_socket_id == 0)
gtk_window_resize(GTK_WINDOW(gui.mainwin), pixel_width, pixel_height);
#else
gtk_form_set_size(GTK_FORM(gui.formwin), pixel_width, pixel_height);
diff --git a/src/window.c b/src/window.c
index 239a809..9f7131e 100644
--- a/src/window.c
+++ b/src/window.c
@@ -1176,7 +1176,6 @@
newp->w_buffer = oldp->w_buffer;
#ifdef FEAT_SYN_HL
- /* TODO: use reference count? */
newp->w_s = &(oldp->w_buffer->b_s);
#endif
oldp->w_buffer->b_nwindows++;