summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/memline.c2
-rw-r--r--src/version.c2
2 files changed, 3 insertions, 1 deletions
diff --git a/src/memline.c b/src/memline.c
index 59e450260..0eb31c3c5 100644
--- a/src/memline.c
+++ b/src/memline.c
@@ -3176,9 +3176,9 @@ ml_replace_len(linenr_T lnum, char_u *line_arg, colnr_T len_arg, int copy)
{
// another line is buffered, flush it
ml_flush_line(curbuf);
+ curbuf->b_ml.ml_flags &= ~ML_LINE_DIRTY;
#ifdef FEAT_TEXT_PROP
- curbuf->b_ml.ml_flags &= ~ML_LINE_DIRTY;
if (has_any_text_properties(curbuf))
// Need to fetch the old line to copy over any text properties.
ml_get_buf(curbuf, lnum, TRUE);
diff --git a/src/version.c b/src/version.c
index 9f097afa4..9a44976f0 100644
--- a/src/version.c
+++ b/src/version.c
@@ -800,6 +800,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 581,
+/**/
580,
/**/
579,