From 91d2e783b41ca900bc603b3cb5e083c8a4a33170 Mon Sep 17 00:00:00 2001 From: Bram Moolenaar Date: Tue, 7 Aug 2018 19:05:01 +0200 Subject: patch 8.1.0245: calling setline() in TextChangedI autocmd breaks undo Problem: Calling setline() in TextChangedI autocmd breaks undo. (Jason Felice) Solution: Don't save lines for undo when already saved. (closes #3291) --- src/edit.c | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'src/edit.c') diff --git a/src/edit.c b/src/edit.c index 45176d79f..b5c129f99 100644 --- a/src/edit.c +++ b/src/edit.c @@ -1722,11 +1722,19 @@ ins_redraw( { aco_save_T aco; + // Sync undo when the autocommand calls setline() or append(), so that + // it can be undone separately. + u_sync_once = 2; + // save and restore curwin and curbuf, in case the autocmd changes them aucmd_prepbuf(&aco, curbuf); apply_autocmds(EVENT_TEXTCHANGEDI, NULL, NULL, FALSE, curbuf); aucmd_restbuf(&aco); curbuf->b_last_changedtick = CHANGEDTICK(curbuf); + + if (u_sync_once == 1) + ins_need_undo = TRUE; + u_sync_once = 0; } #ifdef FEAT_INS_EXPAND -- cgit v1.2.1