From 68a4b04a8d2471adf9de595745437c7cf20b98d8 Mon Sep 17 00:00:00 2001 From: Bram Moolenaar Date: Wed, 29 May 2019 22:28:29 +0200 Subject: patch 8.1.1419: listener callbacks may be called recursively Problem: Listener callbacks may be called recursively. Solution: Set "updating_screen" while listener callbacks are invoked. --- src/change.c | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) (limited to 'src/change.c') diff --git a/src/change.c b/src/change.c index 11f4b0a169..b1a56ae4c0 100644 --- a/src/change.c +++ b/src/change.c @@ -376,10 +376,18 @@ invoke_listeners(buf_T *buf) linenr_T start = MAXLNUM; linenr_T end = 0; linenr_T added = 0; + int save_updating_screen = updating_screen; + static int recursive = FALSE; if (buf->b_recorded_changes == NULL // nothing changed - || buf->b_listener == NULL) // no listeners + || buf->b_listener == NULL // no listeners + || recursive) // already busy return; + recursive = TRUE; + + // Block messages on channels from being handled, so that they don't make + // text changes here. + ++updating_screen; argv[0].v_type = VAR_NUMBER; argv[0].vval.v_number = buf->b_fnum; // a:bufnr @@ -418,6 +426,12 @@ invoke_listeners(buf_T *buf) --textlock; list_unref(buf->b_recorded_changes); buf->b_recorded_changes = NULL; + + if (save_updating_screen) + updating_screen = TRUE; + else + after_updating_screen(TRUE); + recursive = FALSE; } #endif -- cgit v1.2.3