# HG changeset patch # User Bram Moolenaar # Date 1642368603 -3600 # Node ID eb0a1108f885628856811cde35b04466a71a55af # Parent d58b66b0cb2bc61dde6640a6a6a0ddc058f47339 patch 8.2.4117: Vim9: wrong white space error after using imported item Commit: https://github.com/vim/vim/commit/47036b6bd7e5a0b38f093d9f0630f054b04fa68e Author: Bram Moolenaar Date: Sun Jan 16 21:18:53 2022 +0000 patch 8.2.4117: Vim9: wrong white space error after using imported item Problem: Vim9: wrong white space error after using imported item. Solution: Don't skip over white space. (closes https://github.com/vim/vim/issues/9544) diff --git a/src/eval.c b/src/eval.c --- a/src/eval.c +++ b/src/eval.c @@ -6001,7 +6001,6 @@ handle_subscript( idx = find_exported(rettv->vval.v_number, exp_name, &ufunc, &type, evalarg->eval_cctx, verbose); **arg = cc; - *arg = skipwhite(*arg); if (idx < 0 && ufunc == NULL) { diff --git a/src/testdir/test_vim9_import.vim b/src/testdir/test_vim9_import.vim --- a/src/testdir/test_vim9_import.vim +++ b/src/testdir/test_vim9_import.vim @@ -69,6 +69,7 @@ def Test_vim9_import_export() g:imported_name = expo.exp_name expo.exp_name ..= ' Doe' + expo.exp_name = expo.exp_name .. ' Maar' g:imported_name_appended = expo.exp_name g:exported_later = expo.exported @@ -97,7 +98,7 @@ def Test_vim9_import_export() assert_equal('Exported', g:imported_func) assert_equal('Exported', g:funcref_result) assert_equal('John', g:imported_name) - assert_equal('John Doe', g:imported_name_appended) + assert_equal('John Doe Maar', g:imported_name_appended) assert_false(exists('g:name')) Undo_export_script_lines() diff --git a/src/version.c b/src/version.c --- a/src/version.c +++ b/src/version.c @@ -751,6 +751,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 4117, +/**/ 4116, /**/ 4115,