Mercurial > vim

changeset 25636:885fba352580 v8.2.3354

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
patch 8.2.3354: build failure with +byte_offset but without +textprop Commit: https://github.com/vim/vim/commit/92755bba30ec7a4c72ae0280420ba5c3847a9385 Author: Bram Moolenaar <Bram@vim.org> Date: Sun Aug 15 22:18:04 2021 +0200 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.
author Bram Moolenaar <Bram@vim.org>
date Sun, 15 Aug 2021 22:30:03 +0200
parents 4c7934e8a681
children 208c9bcf6cf7
files src/memline.c src/version.c
diffstat 2 files changed, 5 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- 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)
 		{
--- 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,