Mercurial > vim
changeset 10757:6c3d42d18366 v8.0.0268
patch 8.0.0268: may get ml_get error when :luado deletes lines
commit https://github.com/vim/vim/commit/d58f03b1c21b5b0242718f89da53ddd67b1eff6b
Author: Bram Moolenaar <Bram@vim.org>
Date: Sun Jan 29 22:48:45 2017 +0100
patch 8.0.0268: may get ml_get error when :luado deletes lines
Problem: May get ml_get error when :luado deletes lines or switches to
another buffer. (Nikolai Pavlov, issue https://github.com/vim/vim/issues/1421)
Solution: Check the buffer and line every time.
| author | Christian Brabandt <cb@256bit.org> |
|---|---|
| date | Sun, 29 Jan 2017 23:00:04 +0100 |
| parents | 3fb388114d94 |
| children | 35314ebe9e57 |
| files | src/Makefile src/if_lua.c src/testdir/Make_all.mak src/testdir/test_lua.vim src/version.c |
| diffstat | 5 files changed, 36 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/src/Makefile +++ b/src/Makefile @@ -2147,6 +2147,7 @@ test_arglist \ test_langmap \ test_largefile \ test_lispwords \ + test_lua \ test_man \ test_mapping \ test_marks \
--- a/src/if_lua.c +++ b/src/if_lua.c @@ -1716,6 +1716,8 @@ ex_luado(exarg_T *eap) const char *s = (const char *) eap->arg; luaL_Buffer b; size_t len; + buf_T *was_curbuf = curbuf; + if (lua_init() == FAIL) return; if (u_save(eap->line1 - 1, eap->line2 + 1) == FAIL) { @@ -1739,6 +1741,10 @@ ex_luado(exarg_T *eap) lua_replace(L, -2); /* function -> body */ for (l = eap->line1; l <= eap->line2; l++) { + /* Check the line number, the command my have deleted lines. */ + if (l > curbuf->b_ml.ml_line_count) + break; + lua_pushvalue(L, -1); /* function */ luaV_pushline(L, curbuf, l); /* current line as arg */ lua_pushinteger(L, l); /* current line number as arg */ @@ -1747,6 +1753,9 @@ ex_luado(exarg_T *eap) luaV_emsg(L); break; } + /* Catch the command switching to another buffer. */ + if (curbuf != was_curbuf) + break; if (lua_isstring(L, -1)) /* update line? */ { #ifdef HAVE_SANDBOX
--- a/src/testdir/Make_all.mak +++ b/src/testdir/Make_all.mak @@ -164,6 +164,7 @@ NEW_TESTS = test_arglist.res \ test_job_fails.res \ test_json.res \ test_langmap.res \ + test_lua.res \ test_man.res \ test_marks.res \ test_matchadd_conceal.res \ @@ -172,8 +173,8 @@ NEW_TESTS = test_arglist.res \ test_nested_function.res \ test_netbeans.res \ test_normal.res \ + test_packadd.res \ test_paste.res \ - test_packadd.res \ test_perl.res \ test_profile.res \ test_python2.res \
new file mode 100644 --- /dev/null +++ b/src/testdir/test_lua.vim @@ -0,0 +1,22 @@ +" Tests for Lua. +" TODO: move tests from test85.in here. + +if !has('lua') + finish +endif + +func Test_luado() + new + call setline(1, ['one', 'two', 'three']) + luado vim.command("%d_") + bwipe! + + " Check switching to another buffer does not trigger ml_get error. + new + let wincount = winnr('$') + call setline(1, ['one', 'two', 'three']) + luado vim.command("new") + call assert_equal(wincount + 1, winnr('$')) + bwipe! + bwipe! +endfunc