patch 7.4.2020

Problem:    Can't build without +autocmd feature.
Solution:   Adjust #ifdefs.

diff --git a/src/buffer.c b/src/buffer.c
index 8fe2b8a597c735b153011bcb5186338b740233ed..3507f94ca855de7e056ae48498824c58a8ea88e3 100644 (file)
--- a/src/buffer.c
+++ b/src/buffer.c
@@ -1488,9 +1488,7 @@ set_curbuf(buf_T *buf, int action)
 #ifdef FEAT_SYN_HL
     long       old_tw = curbuf->b_p_tw;
 #endif
-#ifdef FEAT_AUTOCMD
     bufref_T   bufref;
-#endif
 
     setpcmark();
     if (!cmdmod.keepalt)
@@ -1502,9 +1500,9 @@ set_curbuf(buf_T *buf, int action)
 
     /* close_windows() or apply_autocmds() may change curbuf */
     prevbuf = curbuf;
+    set_bufref(&bufref, prevbuf);
 
 #ifdef FEAT_AUTOCMD
-    set_bufref(&bufref, prevbuf);
     if (!apply_autocmds(EVENT_BUFLEAVE, NULL, NULL, FALSE, curbuf)
 # ifdef FEAT_EVAL
            || (bufref_valid(&bufref) && !aborting()))

diff --git a/src/version.c b/src/version.c
index 8013b459d482239dbbcb5ba43fc363f8de56a7bd..ebaef410d6ca940137563398f700b1ccc17864f4 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -758,6 +758,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    2020,
 /**/
     2019,
 /**/