From: Bram Moolenaar <Bram@vim.org>
Date: Fri, 17 Jan 2020 18:12:03 +0000 (+0100)
Subject: patch 8.2.0124: compiler warnings for variable types
X-Git-Tag: v8.2.0124
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=109ef128bd6efc8e1fb91a2a51357fcb19897698;p=thirdparty%2Fvim.git

patch 8.2.0124: compiler warnings for variable types

Problem:    Compiler warnings for variable types.
Solution:   Change type, add type cast. (Mike Williams)
---

diff --git a/src/memline.c b/src/memline.c
index 2ac47af117..2c4153946e 100644
--- a/src/memline.c
+++ b/src/memline.c
@@ -5753,8 +5753,8 @@ ml_find_line_or_offset(buf_T *buf, linenr_T lnum, long *offp)
 	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 @@ ml_find_line_or_offset(buf_T *buf, linenr_T lnum, long *offp)
 		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 e3657bfd59..a32231b324 100644
--- a/src/version.c
+++ b/src/version.c
@@ -742,6 +742,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    124,
 /**/
     123,
 /**/