Skip to content

Commit 92755bb

Browse files
committed
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.
1 parent cd6b4f3 commit 92755bb

File tree

2 files changed

+5
-3
lines changed

2 files changed

+5
-3
lines changed

src/memline.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3977,7 +3977,7 @@ ml_flush_line(buf_T *buf)
39773977
*/
39783978
if ((int)dp->db_free >= extra)
39793979
{
3980-
#ifdef FEAT_BYTEOFF
3980+
#if defined(FEAT_BYTEOFF) && defined(FEAT_PROP_POPUP)
39813981
int old_prop_len = 0;
39823982
#endif
39833983
// if the length changes and there are following lines
@@ -3998,15 +3998,15 @@ ml_flush_line(buf_T *buf)
39983998
// adjust free space
39993999
dp->db_free -= extra;
40004000
dp->db_txt_start -= extra;
4001-
#ifdef FEAT_BYTEOFF
4001+
#if defined(FEAT_BYTEOFF) && defined(FEAT_PROP_POPUP)
40024002
if (buf->b_has_textprop)
40034003
old_prop_len = old_len - STRLEN(new_line) - 1;
40044004
#endif
40054005

40064006
// copy new line into the data block
40074007
mch_memmove(old_line - extra, new_line, (size_t)new_len);
40084008
buf->b_ml.ml_flags |= (ML_LOCKED_DIRTY | ML_LOCKED_POS);
4009-
#ifdef FEAT_BYTEOFF
4009+
#if defined(FEAT_BYTEOFF) && defined(FEAT_PROP_POPUP)
40104010
// The else case is already covered by the insert and delete
40114011
if (buf->b_has_textprop)
40124012
{

src/version.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -755,6 +755,8 @@ static char *(features[]) =
755755

756756
static int included_patches[] =
757757
{ /* Add new patch number below this line */
758+
/**/
759+
3354,
758760
/**/
759761
3353,
760762
/**/

0 commit comments

Comments
 (0)