From: Bram Moolenaar Date: Sun, 10 Jul 2016 17:22:53 +0000 (+0200) Subject: patch 7.4.2022 X-Git-Tag: v7.4.2022 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=25065ec375a8a55462f6c07c76dc1a72a770ac19;p=thirdparty%2Fvim.git patch 7.4.2022 Problem: Warnings from 64 bit compiler. Solution: Add type casts. (Mike Williams) --- diff --git a/src/eval.c b/src/eval.c index 8b67604471..b68fcfda55 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 04b7c01789..c9febf7c94 100644 --- a/src/version.c +++ b/src/version.c @@ -758,6 +758,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ +/**/ + 2022, /**/ 2021, /**/