aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/ex_docmd.c2
-rw-r--r--src/version.c2
2 files changed, 3 insertions, 1 deletions
diff --git a/src/ex_docmd.c b/src/ex_docmd.c
index 402ea989a0..542a49f465 100644
--- a/src/ex_docmd.c
+++ b/src/ex_docmd.c
@@ -6364,6 +6364,8 @@ do_exedit (
? ECMD_ONE : eap->do_ecmd_lnum,
(P_HID(curbuf) ? ECMD_HIDE : 0)
+ (eap->forceit ? ECMD_FORCEIT : 0)
+ // After a split we can use an existing buffer.
+ + (old_curwin != NULL ? ECMD_OLDBUF : 0)
+ (eap->cmdidx == CMD_badd ? ECMD_ADDBUF : 0 )
, old_curwin == NULL ? curwin : NULL) == FAIL) {
/* Editing the file failed. If the window was split, close it. */
diff --git a/src/version.c b/src/version.c
index 7866c7e40c..2df590f1a7 100644
--- a/src/version.c
+++ b/src/version.c
@@ -246,7 +246,7 @@ static int included_patches[] = {
//218,
//217,
//216,
- //215,
+ 215,
//214,
213,
//212,