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 f375c1f649..6489168214 100644
--- a/src/buffer.c
+++ b/src/buffer.c
@@ -476,6 +476,7 @@ close_buffer(
unload_buf = TRUE;
#endif
+#ifdef FEAT_AUTOCMD
/* Disallow deleting the buffer when it is locked (already being closed or
* halfway a command that relies on it). Unloading is allowed. */
if (buf->b_locked > 0 && (del_buf || wipe_buf))
@@ -483,6 +484,7 @@ close_buffer(
EMSG(_("E937: Attempt to delete a buffer that is in use"));
return;
}
+#endif
if (win != NULL
#ifdef FEAT_WINDOWS
diff --git a/src/version.c b/src/version.c
index f5843dd502..95777312dc 100644
--- a/src/version.c
+++ b/src/version.c
@@ -764,6 +764,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 2325,
+/**/
2324,
/**/
2323,