To: vim_dev@googlegroups.com
Subject: Patch 8.2.4117
Fcc: outbox
From: Bram Moolenaar <Bram@moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------

Patch 8.2.4117
Problem:    Vim9: wrong white space error after using imported item.
Solution:   Don't skip over white space. (closes #9544)
Files:      src/eval.c, src/testdir/test_vim9_import.vim


*** ../vim-8.2.4116/src/eval.c	2022-01-16 19:38:04.218156782 +0000
--- src/eval.c	2022-01-16 21:17:51.715406519 +0000
***************
*** 6001,6007 ****
  	    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)
  	    {
--- 6001,6006 ----
*** ../vim-8.2.4116/src/testdir/test_vim9_import.vim	2022-01-16 11:11:56.382111551 +0000
--- src/testdir/test_vim9_import.vim	2022-01-16 21:17:27.347439470 +0000
***************
*** 69,74 ****
--- 69,75 ----
  
      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,103 ****
    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_false(exists('g:name'))
  
    Undo_export_script_lines()
--- 98,104 ----
    assert_equal('Exported', g:imported_func)
    assert_equal('Exported', g:funcref_result)
    assert_equal('John', g:imported_name)
!   assert_equal('John Doe Maar', g:imported_name_appended)
    assert_false(exists('g:name'))
  
    Undo_export_script_lines()
*** ../vim-8.2.4116/src/version.c	2022-01-16 20:59:32.429613796 +0000
--- src/version.c	2022-01-16 21:15:07.975634577 +0000
***************
*** 752,753 ****
--- 752,755 ----
  {   /* Add new patch number below this line */
+ /**/
+     4117,
  /**/

-- 
ARTHUR:  Well, I can't just call you `Man'.
DENNIS:  Well, you could say `Dennis'.
ARTHUR:  Well, I didn't know you were called `Dennis.'
DENNIS:  Well, you didn't bother to find out, did you?
                                  The Quest for the Holy Grail (Monty Python)

 /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
///                                                                      \\\
\\\        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ ///
 \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///