summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/ex_cmds2.c2
-rw-r--r--src/netbeans.c2
-rw-r--r--src/version.c2
3 files changed, 4 insertions, 2 deletions
diff --git a/src/ex_cmds2.c b/src/ex_cmds2.c
index 051c716e4..7071794c9 100644
--- a/src/ex_cmds2.c
+++ b/src/ex_cmds2.c
@@ -916,7 +916,7 @@ profile_setlimit(msec, tm)
QueryPerformanceCounter(tm);
QueryPerformanceFrequency(&fr);
- tm->QuadPart += (double)msec / 1000.0 * (double)fr.QuadPart;
+ tm->QuadPart += (LONGLONG)((double)msec / 1000.0 * (double)fr.QuadPart);
# else
long usec;
diff --git a/src/netbeans.c b/src/netbeans.c
index 91b9f207a..e3e32008e 100644
--- a/src/netbeans.c
+++ b/src/netbeans.c
@@ -1217,7 +1217,7 @@ nb_partialremove(linenr_T lnum, colnr_T first, colnr_T last)
oldtext = ml_get(lnum);
oldlen = STRLEN(oldtext);
- if (first >= oldlen || oldlen == 0) /* just in case */
+ if (first >= (colnr_T)oldlen || oldlen == 0) /* just in case */
return;
if (lastbyte >= oldlen)
lastbyte = oldlen - 1;
diff --git a/src/version.c b/src/version.c
index 247299578..2de2b3668 100644
--- a/src/version.c
+++ b/src/version.c
@@ -667,6 +667,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 232,
+/**/
231,
/**/
230,