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 af3e2f4..0a947f9 100644
--- a/src/memline.c
+++ b/src/memline.c
@@ -3566,6 +3566,15 @@
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 @@
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--;