thac0/vim
1
0
Fork 0
forked from aniani/vim
Code Activity

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

Browse Source 
Problem:    Build failure with +byte_offset but without +textprop. (John
            Marriott)
Solution:   Adjust the #ifdef.
This commit is contained in:
Bram Moolenaar
2021-08-15 22:18:04 +02:00
parent cd6b4f3001
commit 92755bba30
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/memline.c
View File

@@ -3977,7 +3977,7 @@ ml_flush_line(buf_T *buf)
*/ */
if ((int)dp->db_free >= extra) if ((int)dp->db_free >= extra)
{ {
#ifdef FEAT_BYTEOFF #if defined(FEAT_BYTEOFF) && defined(FEAT_PROP_POPUP)
int old_prop_len = 0; int old_prop_len = 0;
#endif #endif
// if the length changes and there are following lines // if the length changes and there are following lines
@@ -3998,7 +3998,7 @@ ml_flush_line(buf_T *buf)
// adjust free space // adjust free space
dp->db_free -= extra; dp->db_free -= extra;
dp->db_txt_start -= extra; dp->db_txt_start -= extra;
#ifdef FEAT_BYTEOFF #if defined(FEAT_BYTEOFF) && defined(FEAT_PROP_POPUP)
if (buf->b_has_textprop) if (buf->b_has_textprop)
old_prop_len = old_len - STRLEN(new_line) - 1; old_prop_len = old_len - STRLEN(new_line) - 1;
#endif #endif
@@ -4006,7 +4006,7 @@ ml_flush_line(buf_T *buf)
// copy new line into the data block // copy new line into the data block
mch_memmove(old_line - extra, new_line, (size_t)new_len); mch_memmove(old_line - extra, new_line, (size_t)new_len);
buf->b_ml.ml_flags |= (ML_LOCKED_DIRTY | ML_LOCKED_POS); 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 // The else case is already covered by the insert and delete
if (buf->b_has_textprop) if (buf->b_has_textprop)
{ {

2
src/version.c
View File

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