summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2016-07-10 18:33:59 +0200
committerBram Moolenaar <Bram@vim.org>2016-07-10 18:33:59 +0200
commit453f37dbfd6f8304a36ea84e40a9965404206186 (patch)
tree41e0b6602eb9c6ad192b9b7a0aeb2fbdad4ae8bb /src
parentc4a927ca8dc383190d5df2cacd3f966698b6190c (diff)
downloadvim-git-453f37dbfd6f8304a36ea84e40a9965404206186.tar.gz
patch 7.4.2020v7.4.2020
Problem: Can't build without +autocmd feature. Solution: Adjust #ifdefs.
Diffstat (limited to 'src')
-rw-r--r--src/buffer.c4
-rw-r--r--src/version.c2
2 files changed, 3 insertions, 3 deletions
diff --git a/src/buffer.c b/src/buffer.c
index 8fe2b8a59..3507f94ca 100644
--- 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 8013b459d..ebaef410d 100644
--- a/src/version.c
+++ b/src/version.c
@@ -759,6 +759,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 2020,
+/**/
2019,
/**/
2018,