From 21f0d6cbca9c93e2319d45a33ba26b10a85ff4dc Mon Sep 17 00:00:00 2001
From: Bram Moolenaar <Bram@vim.org>
Date: Thu, 20 Jan 2022 17:35:49 +0000
Subject: [PATCH] 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 #9567)
---
 src/testdir/test_vim9_import.vim | 8 +++++++-
 src/version.c                    | 2 ++
 src/vim9expr.c                   | 1 -
 3 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/src/testdir/test_vim9_import.vim b/src/testdir/test_vim9_import.vim
index 49ff16508..6a38106a7 100644
--- 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
index 901d671a5..fae00dc9d 100644
--- a/src/version.c
+++ b/src/version.c
@@ -750,6 +750,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    4161,
 /**/
     4160,
 /**/
diff --git a/src/vim9expr.c b/src/vim9expr.c
index 7cc307807..d5bb276b7 100644
--- 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;
-- 
2.40.0