aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-07-26 11:04:33 -04:00
Code

patch 8.2.4318: various comment and indent mistakes, returning wrong zero

Browse Source 
Problem:    Various comment and indent mistakes, returning wrong zero.
Solution:   Fix the mistakes.  Return NULL instead of FAIL.
This commit is contained in:
Bram Moolenaar 2022-02-07 13:56:44 +00:00
parent 63ff72aab9
commit 54969f4ef5
6 changed files with 14 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/clientserver.c
View File

@ -651,7 +651,7 @@ build_drop_cmd(
ga_concat(&ga, (char_u *)":"); ga_concat(&ga, (char_u *)":");
if (inicmd != NULL) if (inicmd != NULL)
{ {
// Can't use <CR> after "inicmd", because an "startinsert" would cause // Can't use <CR> after "inicmd", because a "startinsert" would cause
// the following commands to be inserted as text. Use a "|", // the following commands to be inserted as text. Use a "|",
// hopefully "inicmd" does allow this... // hopefully "inicmd" does allow this...
ga_concat(&ga, inicmd); ga_concat(&ga, inicmd);

10
src/eval.c
View File

@ -629,10 +629,10 @@ eval_expr(char_u *arg, exarg_T *eap)
*/ */
static char_u * static char_u *
deref_function_name( deref_function_name(
char_u **arg, char_u **arg,
char_u **tofree, char_u **tofree,
evalarg_T *evalarg, evalarg_T *evalarg,
int verbose) int verbose)
{ {
typval_T ref; typval_T ref;
char_u *name = *arg; char_u *name = *arg;
@ -2955,7 +2955,7 @@ eval_addlist(typval_T *tv1, typval_T *tv2)
/* /*
* Handle fourth level expression: * Handle fourth level expression:
* + number addition * + number addition, concatenation of list or blob
* - number subtraction * - number subtraction
* . string concatenation (if script version is 1) * . string concatenation (if script version is 1)
* .. string concatenation * .. string concatenation

3
src/evalvars.c
View File

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

2
src/version.c
View File

@ -746,6 +746,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
4318,
/**/ /**/
4317, 4317,
/**/ /**/

6
src/vim9cmds.c
View File

@ -1420,7 +1420,7 @@ compile_catch(char_u *arg, cctx_T *cctx UNUSED)
{ {
semsg(_(e_separator_mismatch_str), p); semsg(_(e_separator_mismatch_str), p);
vim_free(tofree); vim_free(tofree);
return FAIL; return NULL;
} }
if (tofree == NULL) if (tofree == NULL)
len = (int)(end - (p + 1)); len = (int)(end - (p + 1));
@ -1430,9 +1430,9 @@ compile_catch(char_u *arg, cctx_T *cctx UNUSED)
vim_free(tofree); vim_free(tofree);
p += len + 2 + dropped; p += len + 2 + dropped;
if (pat == NULL) if (pat == NULL)
return FAIL; return NULL;
if (generate_PUSHS(cctx, &pat) == FAIL) if (generate_PUSHS(cctx, &pat) == FAIL)
return FAIL; return NULL;
if (generate_COMPARE(cctx, EXPR_MATCH, FALSE) == FAIL) if (generate_COMPARE(cctx, EXPR_MATCH, FALSE) == FAIL)
return NULL; return NULL;

2
src/window.c
View File

@ -766,7 +766,7 @@ cmd_with_count(
} }
/* /*
* If "split_disallowed" is set given an error and return FAIL. * If "split_disallowed" is set give an error and return FAIL.
* Otherwise return OK. * Otherwise return OK.
*/ */
static int static int