changeset 19129:d7664581988e v8.2.0124

patch 8.2.0124: compiler warnings for variable types Commit: https://github.com/vim/vim/commit/109ef128bd6efc8e1fb91a2a51357fcb19897698 Author: Bram Moolenaar <Bram@vim.org> Date: Fri Jan 17 19:12:03 2020 +0100 patch 8.2.0124: compiler warnings for variable types Problem: Compiler warnings for variable types. Solution: Change type, add type cast. (Mike Williams)
author Bram Moolenaar <Bram@vim.org>
date Fri, 17 Jan 2020 19:15:04 +0100
parents b3cbb073fb6d
children d329cfe7de68
files src/memline.c src/version.c
diffstat 2 files changed, 5 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/src/memline.c
+++ b/src/memline.c
@@ -5753,8 +5753,8 @@ ml_find_line_or_offset(buf_T *buf, linen
 	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, linen
 		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;
--- a/src/version.c
+++ b/src/version.c
@@ -743,6 +743,8 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    124,
+/**/
     123,
 /**/
     122,