summaryrefslogtreecommitdiff
path: root/src/memline.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/memline.c')
-rw-r--r--src/memline.c10
1 files changed, 6 insertions, 4 deletions
diff --git a/src/memline.c b/src/memline.c
index f1c2a8a52..0eac1cdcb 100644
--- a/src/memline.c
+++ b/src/memline.c
@@ -3662,7 +3662,7 @@ ml_delete_int(buf_T *buf, linenr_T lnum, int flags)
#ifdef FEAT_PROP_POPUP
// If there are text properties, make a copy, so that we can update
// properties in preceding and following lines.
- if (buf->b_has_textprop && !(flags & ML_DEL_UNDO))
+ if (buf->b_has_textprop && !(flags & (ML_DEL_UNDO | ML_DEL_NOPROP)))
{
size_t textlen = STRLEN((char_u *)dp + line_start) + 1;
@@ -3765,9 +3765,11 @@ theend:
{
// Adjust text properties in the line above and below.
if (lnum > 1)
- adjust_text_props_for_delete(buf, lnum - 1, textprop_save, textprop_save_len, TRUE);
+ adjust_text_props_for_delete(buf, lnum - 1, textprop_save,
+ textprop_save_len, TRUE);
if (lnum <= buf->b_ml.ml_line_count)
- adjust_text_props_for_delete(buf, lnum, textprop_save, textprop_save_len, FALSE);
+ adjust_text_props_for_delete(buf, lnum, textprop_save,
+ textprop_save_len, FALSE);
}
vim_free(textprop_save);
#endif
@@ -4021,7 +4023,7 @@ ml_flush_line(buf_T *buf)
| ML_APPEND_NOPROP
#endif
);
- (void)ml_delete_int(buf, lnum, 0);
+ (void)ml_delete_int(buf, lnum, ML_DEL_NOPROP);
}
}
vim_free(new_line);