patch 8.2.0126: textprop test fails

Problem:    Textprop test fails.
Solution:   Fix sign in computation.

diff --git a/src/memline.c b/src/memline.c
index 2c4153946ee490968c8bd27fd6bc0527ce487dc9..aeb8afeaa073945082f0e0c965ef4f79f4baba5e 100644 (file)
--- a/src/memline.c
+++ b/src/memline.c
@@ -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
-                       - (long)(textprop_total - textprop_size)
+                       - (long)(textprop_total + textprop_size)
 #endif
                        + ffdos))
                    break;

diff --git a/src/version.c b/src/version.c
index 1ed040d3280ccea6323a5741f70b96ef1d1e1910..71aecc8a7473d7b17ada19637f2db7103755cb10 100644 (file)
--- 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 */
+/**/
+    126,
 /**/
     125,
 /**/