0
0
mirror of https://github.com/vim/vim.git synced 2025-08-26 20:03:41 -04:00

patch 9.1.1266: MS-Windows: type conversion warnings

Problem:  MS-Windows: type conversion warnings
Solution: cast the variables (Yegappan Lakshmanan)

closes: #17027

Signed-off-by: Yegappan Lakshmanan <yegappan@yahoo.com>
Signed-off-by: Christian Brabandt <cb@256bit.org>
This commit is contained in:
Yegappan Lakshmanan 2025-04-01 20:38:37 +02:00 committed by Christian Brabandt
parent 2f4aa50c91
commit 7b6add0b4a
No known key found for this signature in database
GPG Key ID: F3F92DA383FDDE09
6 changed files with 12 additions and 9 deletions

View File

@ -1203,8 +1203,8 @@ ins_str(char_u *s, size_t slen)
mch_memmove(newp + col, s, slen); mch_memmove(newp + col, s, slen);
mch_memmove(newp + col + slen, oldp + col, (size_t)(oldlen - col + 1)); mch_memmove(newp + col + slen, oldp + col, (size_t)(oldlen - col + 1));
ml_replace(lnum, newp, FALSE); ml_replace(lnum, newp, FALSE);
inserted_bytes(lnum, col, slen); inserted_bytes(lnum, col, (int)slen);
curwin->w_cursor.col += slen; curwin->w_cursor.col += (colnr_T)slen;
} }
/* /*

View File

@ -2962,7 +2962,7 @@ stuff_inserted(
do do
{ {
stuffReadbuffLen(insert.string, insert.length); stuffReadbuffLen(insert.string, (long)insert.length);
// a trailing "0" is inserted as "<C-V>048", "^" as "<C-V>^" // a trailing "0" is inserted as "<C-V>048", "^" as "<C-V>^"
switch (last) switch (last)
{ {
@ -5468,7 +5468,7 @@ do_insert_char_pre(int c)
// Lock the text to avoid weird things from happening. // Lock the text to avoid weird things from happening.
++textlock; ++textlock;
set_vim_var_string(VV_CHAR, buf, buflen); // set v:char set_vim_var_string(VV_CHAR, buf, (int)buflen); // set v:char
res = NULL; res = NULL;
if (ins_apply_autocmds(EVENT_INSERTCHARPRE)) if (ins_apply_autocmds(EVENT_INSERTCHARPRE))

View File

@ -1166,7 +1166,8 @@ vim_findfile(void *search_ctx_arg)
if (*suf == NUL) if (*suf == NUL)
break; break;
file_path.length = len + copy_option_part(&suf, file_path.length = len + copy_option_part(&suf,
file_path.string + len, MAXPATHL - len, ","); file_path.string + len,
(int)(MAXPATHL - len), ",");
} }
} }
} }

View File

@ -1797,7 +1797,7 @@ ins_compl_files(
if (in_fuzzy_collect) if (in_fuzzy_collect)
{ {
leader = ins_compl_leader(); leader = ins_compl_leader();
leader_len = ins_compl_leader_len(); leader_len = (int)ins_compl_leader_len();
} }
for (i = 0; i < count && !got_int && !compl_interrupted; i++) for (i = 0; i < count && !got_int && !compl_interrupted; i++)
@ -4642,7 +4642,7 @@ ins_compl_delete(void)
int has_preinsert = ins_compl_preinsert_effect(); int has_preinsert = ins_compl_preinsert_effect();
if (has_preinsert) if (has_preinsert)
{ {
col += ins_compl_leader_len(); col += (int)ins_compl_leader_len();
curwin->w_cursor.col = compl_ins_end_col; curwin->w_cursor.col = compl_ins_end_col;
} }

View File

@ -478,7 +478,7 @@ pum_compute_text_attrs(char_u *text, hlf_T hlf, int user_hlattr)
else else
{ {
if (matched_len < 0 && MB_STRNICMP(ptr, leader, leader_len) == 0) if (matched_len < 0 && MB_STRNICMP(ptr, leader, leader_len) == 0)
matched_len = leader_len; matched_len = (int)leader_len;
if (matched_len > 0) if (matched_len > 0)
{ {
new_attr = highlight_attr[is_select ? HLF_PMSI : HLF_PMNI]; new_attr = highlight_attr[is_select ? HLF_PMSI : HLF_PMNI];
@ -765,7 +765,7 @@ pum_redraw(void)
MB_PTR_ADV(orig_rt); MB_PTR_ADV(orig_rt);
last_char = orig_rt; last_char = orig_rt;
} }
kept_len = STRLEN(last_char); kept_len = (int)STRLEN(last_char);
new_str = alloc(ellipsis_width + over_cell + kept_len + 1); new_str = alloc(ellipsis_width + over_cell + kept_len + 1);
if (!new_str) if (!new_str)
return; return;

View File

@ -704,6 +704,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
1266,
/**/ /**/
1265, 1265,
/**/ /**/