Patch 8.2.4318

[Bram Moolenaar]

Patch 8.2.4318
Problem: Various comment and indent mistakes, returning wrong zero.
Solution: Fix the mistakes. Return NULL instead of FAIL.
Files: src/clientserver.c, src/eval.c, src/evalvars.c, src/vim9cmds.c,
src/window.c


*** ../vim-8.2.4317/src/clientserver.c 2022-01-28 15:28:00.200927841 +0000
--- src/clientserver.c 2022-01-31 10:37:24.581778509 +0000
***************
*** 651,657 ****
ga_concat(&ga, (char_u *)":");
if (inicmd != NULL)
{
! // Can't use <CR> after "inicmd", because an "startinsert" would cause
// the following commands to be inserted as text. Use a "|",
// hopefully "inicmd" does allow this...
ga_concat(&ga, inicmd);
--- 651,657 ----
ga_concat(&ga, (char_u *)":");
if (inicmd != NULL)
{
! // Can't use <CR> after "inicmd", because a "startinsert" would cause
// the following commands to be inserted as text. Use a "|",
// hopefully "inicmd" does allow this...
ga_concat(&ga, inicmd);
*** ../vim-8.2.4317/src/eval.c 2022-02-02 20:01:21.957210955 +0000
--- src/eval.c 2022-02-04 13:32:35.780670046 +0000
***************
*** 629,638 ****
*/
static char_u *
deref_function_name(
! char_u **arg,
! char_u **tofree,
! evalarg_T *evalarg,
! int verbose)
{
typval_T ref;
char_u *name = *arg;
--- 629,638 ----
*/
static char_u *
deref_function_name(
! char_u **arg,
! char_u **tofree,
! evalarg_T *evalarg,
! int verbose)
{
typval_T ref;
char_u *name = *arg;
***************
*** 2955,2961 ****

/*
* Handle fourth level expression:
! * + number addition
* - number subtraction
* . string concatenation (if script version is 1)
* .. string concatenation
--- 2955,2961 ----

/*
* Handle fourth level expression:
! * + number addition, concatenation of list or blob
* - number subtraction
* . string concatenation (if script version is 1)
* .. string concatenation
*** ../vim-8.2.4317/src/evalvars.c 2022-02-02 20:01:21.957210955 +0000
--- src/evalvars.c 2022-02-03 12:12:22.124438934 +0000
***************
*** 3461,3467 ****
semsg(_(e_illegal_variable_name_str), name);
goto failed;
}
! is_script_local = ht == get_script_local_ht() || sid != 0 || var_in_autoload;

if (vim9script
&& !is_script_local
--- 3461,3468 ----
semsg(_(e_illegal_variable_name_str), name);
goto failed;
}
! is_script_local = ht == get_script_local_ht() || sid != 0
! || var_in_autoload;

if (vim9script
&& !is_script_local
*** ../vim-8.2.4317/src/vim9cmds.c 2022-02-02 16:20:22.386554561 +0000
--- src/vim9cmds.c 2022-02-05 11:57:49.097743282 +0000
***************
*** 1420,1426 ****
{
semsg(_(e_separator_mismatch_str), p);
vim_free(tofree);
! return FAIL;
}
if (tofree == NULL)
len = (int)(end - (p + 1));
--- 1420,1426 ----
{
semsg(_(e_separator_mismatch_str), p);
vim_free(tofree);
! return NULL;
}
if (tofree == NULL)
len = (int)(end - (p + 1));
***************
*** 1430,1438 ****
vim_free(tofree);
p += len + 2 + dropped;
if (pat == NULL)
! return FAIL;
if (generate_PUSHS(cctx, &pat) == FAIL)
! return FAIL;

if (generate_COMPARE(cctx, EXPR_MATCH, FALSE) == FAIL)
return NULL;
--- 1430,1438 ----
vim_free(tofree);
p += len + 2 + dropped;
if (pat == NULL)
! return NULL;
if (generate_PUSHS(cctx, &pat) == FAIL)
! return NULL;

if (generate_COMPARE(cctx, EXPR_MATCH, FALSE) == FAIL)
return NULL;
*** ../vim-8.2.4317/src/window.c 2022-01-29 10:59:48.501909503 +0000
--- src/window.c 2022-02-03 18:36:00.448162048 +0000
***************
*** 766,772 ****
}

/*
! * If "split_disallowed" is set given an error and return FAIL.
* Otherwise return OK.
*/
static int
--- 766,772 ----
}

/*
! * If "split_disallowed" is set give an error and return FAIL.
* Otherwise return OK.
*/
static int
*** ../vim-8.2.4317/src/version.c 2022-02-07 13:53:56.376933433 +0000
--- src/version.c 2022-02-07 13:56:05.680815804 +0000
***************
*** 748,749 ****
--- 748,751 ----
{ /* Add new patch number below this line */
+ /**/
+ 4318,
/**/

--
Shift happens.
-- Doppler

/// 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 ///