diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/memline.c | 6 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 5 insertions, 3 deletions
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 @@ -743,6 +743,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 124, +/**/ 123, /**/ 122, |