diff --git a/src/memline.c b/src/memline.c index 2c4153946e..aeb8afeaa0 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 1ed040d328..71aecc8a74 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 */ +/**/ + 126, /**/ 125, /**/