diff --git a/src/memline.c b/src/memline.c
index 2ac47af..2c41539 100644
--- a/src/memline.c
+++ b/src/memline.c
@@ -5753,8 +5753,8 @@
 	else
 	{
 #ifdef FEAT_PROP_POPUP
-	    long textprop_total = 0;
-	    long textprop_size = 0;
+	    size_t textprop_total = 0;
+	    size_t textprop_size = 0;
 	    char_u *l1, *l2;
 #endif
 
@@ -5774,7 +5774,7 @@
 		if (!(offset >= size
 			+ text_end - (int)((dp->db_index[idx]) & DB_INDEX_MASK)
 #ifdef FEAT_PROP_POPUP
-			- textprop_total - textprop_size
+			- (long)(textprop_total - textprop_size)
 #endif
 			+ ffdos))
 		    break;
diff --git a/src/version.c b/src/version.c
index e3657bf..a32231b 100644
--- a/src/version.c
+++ b/src/version.c
@@ -743,6 +743,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    124,
+/**/
     123,
 /**/
     122,