From: Bram Moolenaar <Bram@vim.org>
Date: Wed, 17 Jul 2019 20:55:35 +0000 (+0200)
Subject: patch 8.1.1711: listener callback called at the wrong moment
X-Git-Tag: v8.1.1711
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=acf7544cf62227972eeb063d6d9ecddaa5682a73;p=vim

patch 8.1.1711: listener callback called at the wrong moment

Problem:    Listener callback called at the wrong moment
Solution:   Invoke listeners before calling ml_delete_int(). (closes #4657)
---

diff --git a/src/memline.c b/src/memline.c
index af3e2f443..0a947f927 100644
--- a/src/memline.c
+++ b/src/memline.c
@@ -3566,6 +3566,15 @@ adjust_text_props_for_delete(
 ml_delete(linenr_T lnum, int message)
 {
     ml_flush_line(curbuf);
+    if (lnum < 1 || lnum > curbuf->b_ml.ml_line_count)
+	return FAIL;
+
+#ifdef FEAT_EVAL
+    // When inserting above recorded changes: flush the changes before changing
+    // the text.
+    may_invoke_listeners(curbuf, lnum, lnum + 1, -1);
+#endif
+
     return ml_delete_int(curbuf, lnum, message);
 }
 
@@ -3590,14 +3599,6 @@ ml_delete_int(buf_T *buf, linenr_T lnum, int message)
     int		textprop_save_len;
 #endif
 
-    if (lnum < 1 || lnum > buf->b_ml.ml_line_count)
-	return FAIL;
-
-#ifdef FEAT_EVAL
-    // When inserting above recorded changes: flush the changes before changing
-    // the text.
-    may_invoke_listeners(buf, lnum, lnum + 1, -1);
-#endif
     if (lowest_marked && lowest_marked > lnum)
 	lowest_marked--;
 
diff --git a/src/version.c b/src/version.c
index 74a16fe36..6c6550b09 100644
--- a/src/version.c
+++ b/src/version.c
@@ -777,6 +777,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1711,
 /**/
     1710,
 /**/