Mercurial > vim
changeset 27583:d4921b91542c v8.2.4318
patch 8.2.4318: various comment and indent mistakes, returning wrong zero
Commit: https://github.com/vim/vim/commit/54969f4ef5825205ecde09ea80f4087fc3b68e5d
Author: Bram Moolenaar <Bram@vim.org>
Date: Mon Feb 7 13:56:44 2022 +0000
patch 8.2.4318: various comment and indent mistakes, returning wrong zero
Problem: Various comment and indent mistakes, returning wrong zero.
Solution: Fix the mistakes. Return NULL instead of FAIL.
| author | Bram Moolenaar <Bram@vim.org> |
|---|---|
| date | Mon, 07 Feb 2022 15:00:05 +0100 |
| parents | de6c8e93b47f |
| children | becde709128e |
| files | src/clientserver.c src/eval.c src/evalvars.c src/version.c src/vim9cmds.c src/window.c |
| diffstat | 6 files changed, 14 insertions(+), 11 deletions(-) [+] |
line wrap: on
line diff
--- a/src/clientserver.c +++ b/src/clientserver.c @@ -651,7 +651,7 @@ build_drop_cmd( ga_concat(&ga, (char_u *)":"); 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 "|", // hopefully "inicmd" does allow this... ga_concat(&ga, inicmd);
--- a/src/eval.c +++ b/src/eval.c @@ -629,10 +629,10 @@ eval_expr(char_u *arg, exarg_T *eap) */ static char_u * deref_function_name( - char_u **arg, - char_u **tofree, - evalarg_T *evalarg, - int verbose) + char_u **arg, + char_u **tofree, + evalarg_T *evalarg, + int verbose) { typval_T ref; char_u *name = *arg; @@ -2955,7 +2955,7 @@ eval_addlist(typval_T *tv1, typval_T *tv /* * Handle fourth level expression: - * + number addition + * + number addition, concatenation of list or blob * - number subtraction * . string concatenation (if script version is 1) * .. string concatenation
--- a/src/evalvars.c +++ b/src/evalvars.c @@ -3461,7 +3461,8 @@ set_var_const( semsg(_(e_illegal_variable_name_str), name); 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 && !is_script_local
--- a/src/version.c +++ b/src/version.c @@ -747,6 +747,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 4318, +/**/ 4317, /**/ 4316,
--- a/src/vim9cmds.c +++ b/src/vim9cmds.c @@ -1420,7 +1420,7 @@ compile_catch(char_u *arg, cctx_T *cctx { semsg(_(e_separator_mismatch_str), p); vim_free(tofree); - return FAIL; + return NULL; } if (tofree == NULL) len = (int)(end - (p + 1)); @@ -1430,9 +1430,9 @@ compile_catch(char_u *arg, cctx_T *cctx vim_free(tofree); p += len + 2 + dropped; if (pat == NULL) - return FAIL; + return NULL; if (generate_PUSHS(cctx, &pat) == FAIL) - return FAIL; + return NULL; if (generate_COMPARE(cctx, EXPR_MATCH, FALSE) == FAIL) return NULL;