To: vim_dev@googlegroups.com Subject: Patch 8.2.4069 Fcc: outbox From: Bram Moolenaar Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ------------ Patch 8.2.4069 Problem: Vim9: import test fails on MS-Windows. Solution: Ignore case. Adjust test to avoid name that only differs in case. Files: src/eval.c, src/scriptfile.c, src/testdir/test_vim9_import.vim *** ../vim-8.2.4068/src/eval.c 2022-01-09 21:32:57.709739119 +0000 --- src/eval.c 2022-01-12 14:32:40.120762268 +0000 *************** *** 906,912 **** NULL, TRUE) == -1) { *p = cc; ! return FAIL; } *p = cc; } --- 906,912 ---- NULL, TRUE) == -1) { *p = cc; ! return NULL; } *p = cc; } *************** *** 5903,5909 **** type_T *type; // Found script from "import {name} as name", script item name must ! // follow. if (**arg != '.') { if (verbose) --- 5903,5909 ---- type_T *type; // Found script from "import {name} as name", script item name must ! // follow. "rettv->vval.v_number" has the script ID. if (**arg != '.') { if (verbose) *** ../vim-8.2.4068/src/scriptfile.c 2022-01-12 12:54:50.472764106 +0000 --- src/scriptfile.c 2022-01-12 14:57:59.399042446 +0000 *************** *** 2156,2162 **** if (p == NULL) return NULL; ! prefix = vim_strsave(p); if (prefix == NULL) return NULL; --- 2156,2162 ---- if (p == NULL) return NULL; ! prefix = strlow_save(p); if (prefix == NULL) return NULL; *** ../vim-8.2.4068/src/testdir/test_vim9_import.vim 2022-01-12 12:48:07.510194380 +0000 --- src/testdir/test_vim9_import.vim 2022-01-12 15:12:15.111891282 +0000 *************** *** 1203,1214 **** g:result = 'other' enddef END ! writefile(lines, 'Xdir/autoload/other.vim') lines =<< trim END vim9script ! import autoload 'other.vim' ! call other.Getother() assert_equal('other', g:result) END CheckScriptSuccess(lines) --- 1203,1214 ---- g:result = 'other' enddef END ! writefile(lines, 'Xdir/autoload/another.vim') lines =<< trim END vim9script ! import autoload 'another.vim' ! call another.Getother() assert_equal('other', g:result) END CheckScriptSuccess(lines) *** ../vim-8.2.4068/src/version.c 2022-01-12 12:54:50.472764106 +0000 --- src/version.c 2022-01-12 15:11:26.724066588 +0000 *************** *** 752,753 **** --- 752,755 ---- { /* Add new patch number below this line */ + /**/ + 4069, /**/ -- GALAHAD hurries to the door and pushes through it. As he leaves the room we CUT TO the reverse to show that he is now in a room full of bathing and romping GIRLIES, all innocent, wide-eyed and beautiful. They smile enchantingly at him as he tries to keep walking without being diverted by the lovely sights assaulting his eyeballs. "Monty Python and the Holy Grail" PYTHON (MONTY) PICTURES LTD /// 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 ///