diff options
| author | Marco Hinz <mh.codebro@gmail.com> | 2014-04-13 18:23:57 +0200 |
|---|---|---|
| committer | Thiago de Arruda <tpadilha84@gmail.com> | 2014-04-16 09:18:08 -0300 |
| commit | 98b0a6ffb460ffdc6b84b4273d8f9834803bfd31 (patch) | |
| tree | 001fa5d4b5e5192b883e3ecb45b23b22c29bf009 | |
| parent | 1b55b127cbfc1c8f41783b6fea6cb7927020ed0c (diff) | |
| download | rneovim-98b0a6ffb460ffdc6b84b4273d8f9834803bfd31.tar.gz rneovim-98b0a6ffb460ffdc6b84b4273d8f9834803bfd31.tar.bz2 rneovim-98b0a6ffb460ffdc6b84b4273d8f9834803bfd31.zip | |
vim-patch: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.
https://code.google.com/p/vim/source/detail?r=f069a3a0f84451aa498c6c22d8f922d1e695e96d
| -rw-r--r-- | src/ex_docmd.c | 2 | ||||
| -rw-r--r-- | src/version.c | 2 |
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, |