summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2016-07-10 19:22:53 +0200
committerBram Moolenaar <Bram@vim.org>2016-07-10 19:22:53 +0200
commit25065ec375a8a55462f6c07c76dc1a72a770ac19 (patch)
tree7b423e732defc57f00e1df54d5347cdd0b8c0406
parent19ff9bf454b7492be64dd87aaf0830fa7961871e (diff)
downloadvim-git-25065ec375a8a55462f6c07c76dc1a72a770ac19.tar.gz
patch 7.4.2022v7.4.2022
Problem: Warnings from 64 bit compiler. Solution: Add type casts. (Mike Williams)
-rw-r--r--src/eval.c4
-rw-r--r--src/version.c2
2 files changed, 4 insertions, 2 deletions
diff --git a/src/eval.c b/src/eval.c
index 8b6760447..b68fcfda5 100644
--- a/src/eval.c
+++ b/src/eval.c
@@ -13108,7 +13108,7 @@ f_getcompletion(typval_T *argvars, typval_T *rettv)
ExpandInit(&xpc);
xpc.xp_pattern = get_tv_string(&argvars[0]);
- xpc.xp_pattern_len = STRLEN(xpc.xp_pattern);
+ xpc.xp_pattern_len = (int)STRLEN(xpc.xp_pattern);
xpc.xp_context = cmdcomplete_str_to_type(get_tv_string(&argvars[1]));
if (xpc.xp_context == EXPAND_NOTHING)
{
@@ -13122,7 +13122,7 @@ f_getcompletion(typval_T *argvars, typval_T *rettv)
if (xpc.xp_context == EXPAND_MENUS)
{
set_context_in_menu_cmd(&xpc, (char_u *)"menu", xpc.xp_pattern, FALSE);
- xpc.xp_pattern_len = STRLEN(xpc.xp_pattern);
+ xpc.xp_pattern_len = (int)STRLEN(xpc.xp_pattern);
}
pat = addstar(xpc.xp_pattern, xpc.xp_pattern_len, xpc.xp_context);
diff --git a/src/version.c b/src/version.c
index 04b7c0178..c9febf7c9 100644
--- a/src/version.c
+++ b/src/version.c
@@ -759,6 +759,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 2022,
+/**/
2021,
/**/
2020,