Mercurial > vim
changeset 16835:7cade95272c4 v8.1.1419
patch 8.1.1419: listener callbacks may be called recursively
commit https://github.com/vim/vim/commit/68a4b04a8d2471adf9de595745437c7cf20b98d8
Author: Bram Moolenaar <Bram@vim.org>
Date: Wed May 29 22:28:29 2019 +0200
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.
author | Bram Moolenaar <Bram@vim.org> |
---|---|
date | Wed, 29 May 2019 22:30:06 +0200 |
parents | d8da28aef349 |
children | 237a080e55a3 |
files | src/change.c src/proto/screen.pro src/screen.c src/ui.c src/version.c |
diffstat | 5 files changed, 27 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- 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
--- a/src/proto/screen.pro +++ b/src/proto/screen.pro @@ -10,7 +10,7 @@ void redraw_buf_and_status_later(buf_T * int redraw_asap(int type); void redraw_after_callback(int call_update_screen); void redrawWinline(win_T *wp, linenr_T lnum); -void reset_updating_screen(int may_resize_shell); +void after_updating_screen(int may_resize_shell); void update_curbuf(int type); int update_screen(int type_arg); int conceal_cursor_line(win_T *wp); @@ -18,7 +18,7 @@ void conceal_check_cursor_line(void); void update_debug_sign(buf_T *buf, linenr_T lnum); void updateWindow(win_T *wp); int screen_get_current_line_off(void); -void screen_line(int row, int coloff, int endcol, int clear_width, int rlflag); +void screen_line(int row, int coloff, int endcol, int clear_width, int flags); void rl_mirror(char_u *str); void status_redraw_all(void); void status_redraw_curbuf(void);
--- a/src/screen.c +++ b/src/screen.c @@ -506,8 +506,12 @@ redrawWinline( redraw_win_later(wp, VALID); } +/* + * To be called when "updating_screen" was set before and now the postponed + * side effects may take place. + */ void -reset_updating_screen(int may_resize_shell UNUSED) +after_updating_screen(int may_resize_shell UNUSED) { updating_screen = FALSE; #ifdef FEAT_GUI @@ -803,7 +807,7 @@ update_screen(int type_arg) FOR_ALL_WINDOWS(wp) wp->w_buffer->b_mod_set = FALSE; - reset_updating_screen(TRUE); + after_updating_screen(TRUE); /* Clear or redraw the command line. Done last, because scrolling may * mess up the command line. */ @@ -886,7 +890,7 @@ update_finish(void) end_search_hl(); # endif - reset_updating_screen(TRUE); + after_updating_screen(TRUE); # ifdef FEAT_GUI /* Redraw the cursor and update the scrollbars when all screen updating is