summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2022-02-07 13:56:44 +0000
committerBram Moolenaar <Bram@vim.org>2022-02-07 13:56:44 +0000
commit54969f4ef5825205ecde09ea80f4087fc3b68e5d (patch)
treea33efdb636d52d421266829a530a15e8f3cedb16
parent63ff72aab91679725077eab5c5405267792268bd (diff)
downloadvim-git-54969f4ef5825205ecde09ea80f4087fc3b68e5d.tar.gz
patch 8.2.4318: various comment and indent mistakes, returning wrong zerov8.2.4318
Problem: Various comment and indent mistakes, returning wrong zero. Solution: Fix the mistakes. Return NULL instead of FAIL.
-rw-r--r--src/clientserver.c2
-rw-r--r--src/eval.c10
-rw-r--r--src/evalvars.c3
-rw-r--r--src/version.c2
-rw-r--r--src/vim9cmds.c6
-rw-r--r--src/window.c2
6 files changed, 14 insertions, 11 deletions
diff --git a/src/clientserver.c b/src/clientserver.c
index 793570abd..caa6fdc66 100644
--- 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);
diff --git a/src/eval.c b/src/eval.c
index b5ccc4bdf..7ab05be12 100644
--- 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 *tv2)
/*
* Handle fourth level expression:
- * + number addition
+ * + number addition, concatenation of list or blob
* - number subtraction
* . string concatenation (if script version is 1)
* .. string concatenation
diff --git a/src/evalvars.c b/src/evalvars.c
index b3436067f..994b9799c 100644
--- 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
diff --git a/src/version.c b/src/version.c
index 956df653a..f30ba25f5 100644
--- 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,
diff --git a/src/vim9cmds.c b/src/vim9cmds.c
index 90b61dbb3..b9a029392 100644
--- a/src/vim9cmds.c
+++ b/src/vim9cmds.c
@@ -1420,7 +1420,7 @@ compile_catch(char_u *arg, cctx_T *cctx UNUSED)
{
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 UNUSED)
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;
diff --git a/src/window.c b/src/window.c
index f80334d72..4fb92e035 100644
--- a/src/window.c
+++ b/src/window.c
@@ -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.
*/
static int