summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2020-01-17 21:00:59 +0100
committerBram Moolenaar <Bram@vim.org>2020-01-17 21:00:59 +0100
commit94b6fb78c578caab014fea4029bb534246a95f6f (patch)
tree71e7574ab6befb2ae6ff9051aea18881de75a08b
parent3c71aec6966da0ebefc451ded4fbc43f426654f3 (diff)
downloadvim-git-94b6fb78c578caab014fea4029bb534246a95f6f.tar.gz
patch 8.2.0126: textprop test failsv8.2.0126
Problem: Textprop test fails. Solution: Fix sign in computation.
-rw-r--r--src/memline.c2
-rw-r--r--src/version.c2
2 files changed, 3 insertions, 1 deletions
diff --git a/src/memline.c b/src/memline.c
index 2c4153946..aeb8afeaa 100644
--- 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 1ed040d32..71aecc8a7 100644
--- 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 */
/**/
+ 126,
+/**/
125,
/**/
124,