diff options
| author | Bram Moolenaar <Bram@vim.org> | 2021-08-15 22:18:04 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2021-08-15 22:18:04 +0200 |
| commit | 92755bba30ec7a4c72ae0280420ba5c3847a9385 (patch) | |
| tree | 17c8e8724acb5f3977abb204dc2ed7b72c488921 | |
| parent | cd6b4f300189b4920f7ee7f0204338e91210674b (diff) | |
| download | vim-git-92755bba30ec7a4c72ae0280420ba5c3847a9385.tar.gz | |
patch 8.2.3354: build failure with +byte_offset but without +textpropv8.2.3354
Problem: Build failure with +byte_offset but without +textprop. (John
Marriott)
Solution: Adjust the #ifdef.
| -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 40eecea6c..f4649841f 100644 --- a/src/memline.c +++ b/src/memline.c @@ -3977,7 +3977,7 @@ ml_flush_line(buf_T *buf) */ if ((int)dp->db_free >= extra) { -#ifdef FEAT_BYTEOFF +#if defined(FEAT_BYTEOFF) && defined(FEAT_PROP_POPUP) int old_prop_len = 0; #endif // if the length changes and there are following lines @@ -3998,7 +3998,7 @@ ml_flush_line(buf_T *buf) // adjust free space dp->db_free -= extra; dp->db_txt_start -= extra; -#ifdef FEAT_BYTEOFF +#if defined(FEAT_BYTEOFF) && defined(FEAT_PROP_POPUP) if (buf->b_has_textprop) old_prop_len = old_len - STRLEN(new_line) - 1; #endif @@ -4006,7 +4006,7 @@ ml_flush_line(buf_T *buf) // copy new line into the data block mch_memmove(old_line - extra, new_line, (size_t)new_len); buf->b_ml.ml_flags |= (ML_LOCKED_DIRTY | ML_LOCKED_POS); -#ifdef FEAT_BYTEOFF +#if defined(FEAT_BYTEOFF) && defined(FEAT_PROP_POPUP) // The else case is already covered by the insert and delete if (buf->b_has_textprop) { diff --git a/src/version.c b/src/version.c index f2ac23782..eed8bb0d9 100644 --- a/src/version.c +++ b/src/version.c @@ -756,6 +756,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 3354, +/**/ 3353, /**/ 3352, |