summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/if_lua.c1
-rw-r--r--src/testdir/test_lua.vim4
-rw-r--r--src/version.c2
3 files changed, 5 insertions, 2 deletions
diff --git a/src/if_lua.c b/src/if_lua.c
index 79fb68168b..5810401633 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 2f204048f6..c30f9597ea 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 b705749aab..13b6425dc8 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,