diff --git a/src/buffer.c b/src/buffer.c
index f4713a1f790104f198609a82806d43e7100a6326..cfe408093c8c6df25220d42387a96322951bbb5a 100644
--- a/src/buffer.c
+++ b/src/buffer.c
@@ -1441,7 +1441,9 @@ set_curbuf(buf, action)
 enter_buffer(buf)
     buf_T	*buf;
 {
+#ifdef FEAT_SYN_HL
     long old_tw = curbuf->b_p_tw;
+#endif
 
     /* Copy buffer and window local option values.  Not for a help buffer. */
     buf_copy_options(buf, BCO_ENTER | BCO_NOHELP);
diff --git a/src/version.c b/src/version.c
index 6f3020cae2b102e600e0d85e43138e22e4fb49a8..261a032cb042816e7ff4e2af15fa388bc0b0039b 100644
--- a/src/version.c
+++ b/src/version.c
@@ -725,6 +725,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    804,
 /**/
     803,
 /**/