diff options
author | Bram Moolenaar <Bram@vim.org> | 2021-07-28 21:48:59 +0200 |
---|---|---|
committer | Bram Moolenaar <Bram@vim.org> | 2021-07-28 21:48:59 +0200 |
commit | 2a4bd00cef1a291059903e26a126b84718e47804 (patch) | |
tree | 1d9fd6cf9330afde47795f0178f68d418586a18b | |
parent | 81530e36033dec2c2cd94af6dd48ceb0389e95a2 (diff) | |
download | vim-git-2a4bd00cef1a291059903e26a126b84718e47804.tar.gz |
patch 8.2.3240: Lua print() does not work properlyv8.2.3240
Problem: Lua print() does not work properly.
Solution: Put back lua_pop().
-rw-r--r-- | src/if_lua.c | 1 | ||||
-rw-r--r-- | src/testdir/test_lua.vim | 4 | ||||
-rw-r--r-- | src/version.c | 2 |
3 files changed, 5 insertions, 2 deletions
diff --git a/src/if_lua.c b/src/if_lua.c index 79fb68168..581040163 100644 --- a/src/if_lua.c +++ b/src/if_lua.c @@ -1737,6 +1737,7 @@ luaV_print(lua_State *L) if (i > 1) luaL_addchar(&b, ' '); // use space instead of tab luaV_addlstring(&b, s, l, 0); + lua_pop(L, 1); } luaL_pushresult(&b); if (!got_int) diff --git a/src/testdir/test_lua.vim b/src/testdir/test_lua.vim index 2f204048f..c30f9597e 100644 --- a/src/testdir/test_lua.vim +++ b/src/testdir/test_lua.vim @@ -870,8 +870,8 @@ endfunc " Test for dealing with strings containing newlines and null character func Test_lua_string_with_newline() - let x = execute('lua print("Hello\nWorld")') - call assert_equal("\nHello\nWorld", x) + let x = execute('lua print("Hello\nWorld", 2)') + call assert_equal("\nHello\nWorld 2", x) new lua k = vim.buffer(vim.eval('bufnr()')) lua k:insert("Hello\0World", 0) diff --git a/src/version.c b/src/version.c index b705749aa..13b6425dc 100644 --- a/src/version.c +++ b/src/version.c @@ -756,6 +756,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 3240, +/**/ 3239, /**/ 3238, |