diff --git a/src/buffer.c b/src/buffer.c
index 8fe2b8a..3507f94 100644
--- a/src/buffer.c
+++ b/src/buffer.c
@@ -1488,9 +1488,7 @@
 #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 @@
 
     /* 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 8013b45..ebaef41 100644
--- a/src/version.c
+++ b/src/version.c
@@ -759,6 +759,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    2020,
+/**/
     2019,
 /**/
     2018,