summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/buffer.c2
-rw-r--r--src/version.c2
2 files changed, 4 insertions, 0 deletions
diff --git a/src/buffer.c b/src/buffer.c
index f4713a1f79..cfe408093c 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 6f3020cae2..261a032cb0 100644
--- a/src/version.c
+++ b/src/version.c
@@ -726,6 +726,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 804,
+/**/
803,
/**/
802,