# HG changeset patch
# User Bram Moolenaar <Bram@vim.org>
# Date 1642700704 -3600
# Node ID 8a097fc07aa4b15fd3d473fb44ceea6c26721d58
# Parent  b2eff72f957ea5b484e4f0643f3d982fd5361520
patch 8.2.4161: Vim9: warning for missing white space after imported variable

Commit: https://github.com/vim/vim/commit/21f0d6cbca9c93e2319d45a33ba26b10a85ff4dc
Author: Bram Moolenaar <Bram@vim.org>
Date:   Thu Jan 20 17:35:49 2022 +0000

    patch 8.2.4161: Vim9: warning for missing white space after imported variable

    Problem:    Vim9: warning for missing white space after imported variable.
    Solution:   Do not skip white space. (closes https://github.com/vim/vim/issues/9567)

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
@@ -67,6 +67,11 @@ def Test_vim9_import_export()
     enddef
     g:funcref_result = GetExported()
 
+    def GetName(): string
+      return expo.exp_name .. 'son'
+    enddef
+    g:long_name = GetName()
+
     g:imported_name = expo.exp_name
     expo.exp_name ..= ' Doe'
     expo.exp_name = expo.exp_name .. ' Maar'
@@ -98,6 +103,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('Johnson', g:long_name)
   assert_equal('John Doe Maar', g:imported_name_appended)
   assert_false(exists('g:name'))
 
@@ -109,7 +115,7 @@ def Test_vim9_import_export()
   unlet g:exported_i2
   unlet g:exported_later
   unlet g:imported_func
-  unlet g:imported_name g:imported_name_appended
+  unlet g:imported_name g:long_name g:imported_name_appended
   delete('Ximport.vim')
 
   # similar, with line breaks
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 */
 /**/
+    4161,
+/**/
     4160,
 /**/
     4159,
diff --git a/src/vim9expr.c b/src/vim9expr.c
--- a/src/vim9expr.c
+++ b/src/vim9expr.c
@@ -321,7 +321,6 @@ compile_load_scriptvar(
 								   cctx, TRUE);
 	}
 	*p = cc;
-	p = skipwhite(p);
 	*end = p;
 	if (done)
 	    return res;