Patch 9.0.0498

[Bram Moolenaar]

Patch 9.0.0498
Problem: Various small issues.
Solution: Various small fixes.
Files: src/arglist.c, src/cmdexpand.c, src/debugger.c, src/findfile.c,
src/if_xcmdsrv.c, src/testdir/test_lambda.vim,
src/testdir/test_vim9_cmd.vim


*** ../vim-9.0.0497/src/arglist.c 2022-09-05 18:27:38.847160366 +0100
--- src/arglist.c 2022-09-06 10:28:15.235056859 +0100
***************
*** 982,988 ****
{
if (i < aall->alist->al_ga.ga_len
&& (AARGLIST(aall->alist)[i].ae_fnum == buf->b_fnum
! || fullpathcmp(alist_name(&AARGLIST(aall->alist)[i]),
buf->b_ffname, TRUE, TRUE) & FPC_SAME))
{
int weight = 1;
--- 982,989 ----
{
if (i < aall->alist->al_ga.ga_len
&& (AARGLIST(aall->alist)[i].ae_fnum == buf->b_fnum
! || fullpathcmp(alist_name(
! &AARGLIST(aall->alist)[i]),
buf->b_ffname, TRUE, TRUE) & FPC_SAME))
{
int weight = 1;
***************
*** 1000,1006 ****
if (i == 0)
{
if (aall->new_curwin != NULL)
! aall->new_curwin->w_arg_idx = aall->opened_len;
aall->new_curwin = wp;
aall->new_curtab = curtab;
}
--- 1001,1008 ----
if (i == 0)
{
if (aall->new_curwin != NULL)
! aall->new_curwin->w_arg_idx =
! aall->opened_len;
aall->new_curwin = wp;
aall->new_curtab = curtab;
}
*** ../vim-9.0.0497/src/cmdexpand.c 2022-09-02 15:15:11.059569191 +0100
--- src/cmdexpand.c 2022-09-02 19:16:03.531827526 +0100
***************
*** 2394,2399 ****
--- 2394,2400 ----

/*
* Expand file or directory names.
+ * Returns OK or FAIL.
*/
static int
expand_files_and_dirs(
*** ../vim-9.0.0497/src/debugger.c 2022-09-13 12:36:53.860094694 +0100
--- src/debugger.c 2022-09-13 14:34:14.989235331 +0100
***************
*** 135,141 ****
ignore_script = TRUE;
}

! // don't debug any function call, e.g. from an expresion mapping
n = debug_break_level;
debug_break_level = -1;

--- 135,141 ----
ignore_script = TRUE;
}

! // don't debug any function call, e.g. from an expression mapping
n = debug_break_level;
debug_break_level = -1;

*** ../vim-9.0.0497/src/findfile.c 2022-08-25 18:12:00.350668422 +0100
--- src/findfile.c 2022-09-05 12:06:46.064816893 +0100
***************
*** 1931,1942 ****
*/
len = 0;
while (vim_isfilec(ptr[len]) || (ptr[len] == '\\' && ptr[len + 1] == ' ')
! || ((options & FNAME_HYP) && path_is_url(ptr + len))
! || (is_url && vim_strchr((char_u *)":?&=", ptr[len]) != NULL))
{
! // After type:// we also include :, ?, & and = as valid characters, so that
! // http://google.com:8080?q=this&that=ok works.
! if ((ptr[len] >= 'A' && ptr[len] <= 'Z') || (ptr[len] >= 'a' && ptr[len] <= 'z'))
{
if (in_type && path_is_url(ptr + len + 1))
is_url = TRUE;
--- 1931,1943 ----
*/
len = 0;
while (vim_isfilec(ptr[len]) || (ptr[len] == '\\' && ptr[len + 1] == ' ')
! || ((options & FNAME_HYP) && path_is_url(ptr + len))
! || (is_url && vim_strchr((char_u *)":?&=", ptr[len]) != NULL))
{
! // After type:// we also include :, ?, & and = as valid characters, so
! // that http://google.com:8080?q=this&that=ok works.
! if ((ptr[len] >= 'A' && ptr[len] <= 'Z')
! || (ptr[len] >= 'a' && ptr[len] <= 'z'))
{
if (in_type && path_is_url(ptr + len + 1))
is_url = TRUE;
*** ../vim-9.0.0497/src/if_xcmdsrv.c 2022-03-20 11:02:23.000000000 +0000
--- src/if_xcmdsrv.c 2022-09-08 10:52:33.439871522 +0100
***************
*** 774,780 ****
/*
* Wait for replies from id (win)
* When "timeout" is non-zero wait up to this many seconds.
! * Return 0 and the malloc'ed string when a reply is available.
* Return -1 if the window becomes invalid while waiting.
*/
int
--- 774,780 ----
/*
* Wait for replies from id (win)
* When "timeout" is non-zero wait up to this many seconds.
! * Return 0 and the allocated string in "*str" when a reply is available.
* Return -1 if the window becomes invalid while waiting.
*/
int
*** ../vim-9.0.0497/src/testdir/test_lambda.vim 2022-05-06 21:47:04.000000000 +0100
--- src/testdir/test_lambda.vim 2022-09-17 20:47:28.630598821 +0100
***************
*** 251,259 ****
func Test_lambda_combination()
call assert_equal(2, {x -> {x -> x}}(1)(2))
call assert_equal(10, {y -> {x -> x(y)(10)}({y -> y})}({z -> z}))
! if has('float')
! call assert_equal(5.0, {x -> {y -> x / y}}(10)(2.0))
! endif
call assert_equal(6, {x -> {y -> {z -> x + y + z}}}(1)(2)(3))

call assert_equal(6, {x -> {f -> f(x)}}(3)({x -> x * 2}))
--- 251,257 ----
func Test_lambda_combination()
call assert_equal(2, {x -> {x -> x}}(1)(2))
call assert_equal(10, {y -> {x -> x(y)(10)}({y -> y})}({z -> z}))
! call assert_equal(5.0, {x -> {y -> x / y}}(10)(2.0))
call assert_equal(6, {x -> {y -> {z -> x + y + z}}}(1)(2)(3))

call assert_equal(6, {x -> {f -> f(x)}}(3)({x -> x * 2}))
*** ../vim-9.0.0497/src/testdir/test_vim9_cmd.vim 2022-09-11 15:14:00.551020049 +0100
--- src/testdir/test_vim9_cmd.vim 2022-09-17 20:49:54.662287774 +0100
***************
*** 52,73 ****
END
v9.CheckScriptFailure(lines, 'E115:')

! if has('float')
! lines =<< trim END
! vim9script
! echo .10
! END
! v9.CheckScriptSuccess(lines)
! lines =<< trim END
! vim9cmd echo .10
! END
! v9.CheckScriptSuccess(lines)
! lines =<< trim END
! vim9script
! legacy echo .10
! END
! v9.CheckScriptFailure(lines, 'E15:')
! endif

echo v:version
assert_fails('vim9cmd echo version', 'E121:')
--- 52,71 ----
END
v9.CheckScriptFailure(lines, 'E115:')

! lines =<< trim END
! vim9script
! echo .10
! END
! v9.CheckScriptSuccess(lines)
! lines =<< trim END
! vim9cmd echo .10
! END
! v9.CheckScriptSuccess(lines)
! lines =<< trim END
! vim9script
! legacy echo .10
! END
! v9.CheckScriptFailure(lines, 'E15:')

echo v:version
assert_fails('vim9cmd echo version', 'E121:')
*** ../vim-9.0.0497/src/version.c 2022-09-18 12:46:16.219996816 +0100
--- src/version.c 2022-09-18 13:05:17.861295787 +0100
***************
*** 701,702 ****
--- 701,704 ----
{ /* Add new patch number below this line */
+ /**/
+ 498,
/**/

--
I AM THANKFUL...
...for the mess to clean after a party because it means I have
been surrounded by friends.

/// Bram Moolenaar -- Br...@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 ///