summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2014-03-25 13:03:48 +0100
committerBram Moolenaar <Bram@vim.org>2014-03-25 13:03:48 +0100
commit7b44934037cf2a603df8c9dcd6f82cdde4ec4940 (patch)
tree22c351d509575399a1ddf9247fdc0cad99dd6255 /src
parent03305f396ff7be377cb608f1a281c1eb5aa80d0b (diff)
downloadvim-7b44934037cf2a603df8c9dcd6f82cdde4ec4940.zip
updated for version 7.4.215
Problem: Inconsistency: ":sp foo" does not reload "foo", unless "foo" is the current buffer. (Liang Li) Solution: Do not reload the current buffer on a split command.
Diffstat (limited to 'src')
-rw-r--r--src/ex_docmd.c2
-rw-r--r--src/version.c2
2 files changed, 4 insertions, 0 deletions
diff --git a/src/ex_docmd.c b/src/ex_docmd.c
index 95c699d98..a63f8f66b 100644
--- a/src/ex_docmd.c
+++ b/src/ex_docmd.c
@@ -7938,6 +7938,8 @@ do_exedit(eap, old_curwin)
? 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)
#ifdef FEAT_LISTCMDS
+ (eap->cmdidx == CMD_badd ? ECMD_ADDBUF : 0 )
#endif
diff --git a/src/version.c b/src/version.c
index 43b921a12..bf33f2d40 100644
--- a/src/version.c
+++ b/src/version.c
@@ -735,6 +735,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 215,
+/**/
214,
/**/
213,