summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/edit.c4
-rw-r--r--src/version.c2
2 files changed, 4 insertions, 2 deletions
diff --git a/src/edit.c b/src/edit.c
index 7c7fadd10a..731b9dc7ff 100644
--- a/src/edit.c
+++ b/src/edit.c
@@ -1894,7 +1894,7 @@ init_prompt(int cmdchar_todo)
|| Insstart_orig.col != (int)STRLEN(prompt))
{
Insstart.lnum = curwin->w_cursor.lnum;
- Insstart.col = STRLEN(prompt);
+ Insstart.col = (int)STRLEN(prompt);
Insstart_orig = Insstart;
Insstart_textlen = Insstart.col;
Insstart_blank_vcol = MAXCOL;
@@ -1904,7 +1904,7 @@ init_prompt(int cmdchar_todo)
if (cmdchar_todo == 'A')
coladvance((colnr_T)MAXCOL);
if (cmdchar_todo == 'I' || curwin->w_cursor.col <= (int)STRLEN(prompt))
- curwin->w_cursor.col = STRLEN(prompt);
+ curwin->w_cursor.col = (int)STRLEN(prompt);
/* Make sure the cursor is in a valid position. */
check_cursor();
}
diff --git a/src/version.c b/src/version.c
index 0c804b9a55..88c1fb110c 100644
--- a/src/version.c
+++ b/src/version.c
@@ -762,6 +762,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 40,
+/**/
39,
/**/
38,