Merge pull request #16725 from VVKot/vim-8.1.0040

vim-patch:8.1.0040: warnings from 64-bit compiler
This commit is contained in:
Björn Linse 2021-12-25 19:32:13 +01:00 committed by GitHub
commit 2ae63161e8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -1685,7 +1685,7 @@ static void init_prompt(int cmdchar_todo)
// Insert always starts after the prompt, allow editing text after it. // Insert always starts after the prompt, allow editing text after it.
if (Insstart_orig.lnum != curwin->w_cursor.lnum || Insstart_orig.col != (colnr_T)STRLEN(prompt)) { if (Insstart_orig.lnum != curwin->w_cursor.lnum || Insstart_orig.col != (colnr_T)STRLEN(prompt)) {
Insstart.lnum = curwin->w_cursor.lnum; Insstart.lnum = curwin->w_cursor.lnum;
Insstart.col = STRLEN(prompt); Insstart.col = (colnr_T)STRLEN(prompt);
Insstart_orig = Insstart; Insstart_orig = Insstart;
Insstart_textlen = Insstart.col; Insstart_textlen = Insstart.col;
Insstart_blank_vcol = MAXCOL; Insstart_blank_vcol = MAXCOL;
@ -1696,7 +1696,7 @@ static void init_prompt(int cmdchar_todo)
coladvance(MAXCOL); coladvance(MAXCOL);
} }
if (curwin->w_cursor.col < (colnr_T)STRLEN(prompt)) { if (curwin->w_cursor.col < (colnr_T)STRLEN(prompt)) {
curwin->w_cursor.col = STRLEN(prompt); curwin->w_cursor.col = (colnr_T)STRLEN(prompt);
} }
// Make sure the cursor is in a valid position. // Make sure the cursor is in a valid position.
check_cursor(); check_cursor();