summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/ops.c2
-rw-r--r--src/version.c2
2 files changed, 3 insertions, 1 deletions
diff --git a/src/ops.c b/src/ops.c
index 29fac4cd4..8f0031401 100644
--- a/src/ops.c
+++ b/src/ops.c
@@ -2605,7 +2605,7 @@ op_change(oap)
/* Auto-indenting may have changed the indent. If the cursor was past
* the indent, exclude that indent change from the inserted text. */
firstline = ml_get(oap->start.lnum);
- if (bd.textcol > pre_indent)
+ if (bd.textcol > (colnr_T)pre_indent)
{
long new_indent = (long)(skipwhite(firstline) - firstline);
diff --git a/src/version.c b/src/version.c
index 8abc48110..9a40b66e4 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 */
/**/
+ 118,
+/**/
117,
/**/
116,