diff options
| -rw-r--r-- | src/buffer.c | 6 | ||||
| -rw-r--r-- | src/testdir/test_bufline.vim | 27 | ||||
| -rw-r--r-- | src/version.c | 2 |
3 files changed, 35 insertions, 0 deletions
diff --git a/src/buffer.c b/src/buffer.c index b536be64b..a4afe132e 100644 --- a/src/buffer.c +++ b/src/buffer.c @@ -428,7 +428,10 @@ can_unload_buffer(buf_T *buf) FOR_ALL_WINDOWS(wp) if (wp->w_buffer == buf) + { can_unload = FALSE; + break; + } } if (!can_unload) EMSG(_("E937: Attempt to delete a buffer that is in use")); @@ -1742,6 +1745,9 @@ enter_buffer(buf_T *buf) /* mark cursor position as being invalid */ curwin->w_valid = 0; + buflist_setfpos(curbuf, curwin, curbuf->b_last_cursor.lnum, + curbuf->b_last_cursor.col, TRUE); + /* Make sure the buffer is loaded. */ if (curbuf->b_ml.ml_mfp == NULL) /* need to load the file */ { diff --git a/src/testdir/test_bufline.vim b/src/testdir/test_bufline.vim index 1f83e8b77..524144d5b 100644 --- a/src/testdir/test_bufline.vim +++ b/src/testdir/test_bufline.vim @@ -91,6 +91,33 @@ func Test_appendbufline() exe "bwipe! " . b endfunc +func Test_appendbufline_no_E315() + let after = [ + \ 'set stl=%f ls=2', + \ 'new', + \ 'let buf = bufnr("%")', + \ 'quit', + \ 'vsp', + \ 'exec "buffer" buf', + \ 'wincmd w', + \ 'call appendbufline(buf, 0, "abc")', + \ 'redraw', + \ 'while getbufline(buf, 1)[0] =~ "^\\s*$"', + \ ' sleep 10m', + \ 'endwhile', + \ 'au VimLeavePre * call writefile([v:errmsg], "Xerror")', + \ 'au VimLeavePre * call writefile(["done"], "Xdone")', + \ 'qall!', + \ ] + if !RunVim([], after, '--clean') + return + endif + call assert_notmatch("^E315:", readfile("Xerror")[0]) + call assert_equal("done", readfile("Xdone")[0]) + call delete("Xerror") + call delete("Xdone") +endfunc + func Test_deletebufline() new let b = bufnr('%') diff --git a/src/version.c b/src/version.c index dd764ea3c..22cc075d0 100644 --- a/src/version.c +++ b/src/version.c @@ -795,6 +795,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 425, +/**/ 424, /**/ 423, |