summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2022-06-27 22:17:37 +0100
committerBram Moolenaar <Bram@vim.org>2022-06-27 22:17:37 +0100
commit944cc9ceba8868acd238264d4a3894803c566b37 (patch)
tree7a901be2f02ec0e9c43051471da42e2d28e3f413
parent069a7d561bbe7e3b9bf132f71b7121c59f99e8f1 (diff)
patch 8.2.5170: tiny issuesv8.2.5170
Problem: Tiny issues. Solution: Tiny improvements.
-rw-r--r--src/misc1.c3
-rw-r--r--src/screen.c2
-rw-r--r--src/version.c2
-rw-r--r--src/vim.h2
4 files changed, 6 insertions, 3 deletions
diff --git a/src/misc1.c b/src/misc1.c
index fd85eff9c8..91e208b352 100644
--- a/src/misc1.c
+++ b/src/misc1.c
@@ -2404,7 +2404,8 @@ get_cmd_output_as_rettv(
if (in_vim9script()
&& (check_for_string_arg(argvars, 0) == FAIL
- || check_for_opt_string_or_number_or_list_arg(argvars, 1) == FAIL))
+ || check_for_opt_string_or_number_or_list_arg(argvars, 1)
+ == FAIL))
return;
if (argvars[1].v_type != VAR_UNKNOWN)
diff --git a/src/screen.c b/src/screen.c
index a5b77e236c..82a0e91ddc 100644
--- a/src/screen.c
+++ b/src/screen.c
@@ -4133,7 +4133,7 @@ screen_del_lines(
skip_showmode()
{
// Call char_avail() only when we are going to show something, because it
- // takes a bit of time. redrawing() may also call char_avail_avail().
+ // takes a bit of time. redrawing() may also call char_avail().
if (global_busy
|| msg_silent != 0
|| !redrawing()
diff --git a/src/version.c b/src/version.c
index 4a7e83f9c4..abe9d36081 100644
--- a/src/version.c
+++ b/src/version.c
@@ -736,6 +736,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 5170,
+/**/
5169,
/**/
5168,
diff --git a/src/vim.h b/src/vim.h
index 1e66d514c0..97ce6390eb 100644
--- a/src/vim.h
+++ b/src/vim.h
@@ -1653,7 +1653,7 @@ void *vim_memset(void *, int, size_t);
/*
* defines to avoid typecasts from (char_u *) to (char *) and back
- * (vim_strchr() and vim_strrchr() are now in alloc.c)
+ * (vim_strchr() and vim_strrchr() are now in strings.c)
*/
#define STRLEN(s) strlen((char *)(s))
#define STRCPY(d, s) strcpy((char *)(d), (char *)(s))