From: Bram Moolenaar <Bram@vim.org>
Date: Sun, 15 Aug 2021 20:18:04 +0000 (+0200)
Subject: patch 8.2.3354: build failure with +byte_offset but without +textprop
X-Git-Tag: v8.2.3354
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=92755bba30ec7a4c72ae0280420ba5c3847a9385;p=vim

patch 8.2.3354: build failure with +byte_offset but without +textprop

Problem:    Build failure with +byte_offset but without +textprop. (John
            Marriott)
Solution:   Adjust the #ifdef.
---

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
@@ -755,6 +755,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    3354,
 /**/
     3353,
 /**/