From e7d1376b636e6c758196c3542bd2c1053f9edb75 Mon Sep 17 00:00:00 2001 From: Bram Moolenaar Date: Fri, 30 Oct 2015 14:23:33 +0100 Subject: patch 7.4.901 Problem: When a BufLeave autocommand changes folding in a way it syncs undo, undo can be corrupted. Solution: Prevent undo sync. (Jacob Niehus) --- src/popupmnu.c | 10 ++++++++++ 1 file changed, 10 insertions(+) (limited to 'src/popupmnu.c') diff --git a/src/popupmnu.c b/src/popupmnu.c index 68ee2d562..2f5e7dc81 100644 --- a/src/popupmnu.c +++ b/src/popupmnu.c @@ -568,7 +568,11 @@ pum_set_selected(n, repeat) if (p_pvh > 0 && p_pvh < g_do_tagpreview) g_do_tagpreview = p_pvh; ++RedrawingDisabled; + /* Prevent undo sync here, if an autocommand syncs undo weird + * things can happen to the undo tree. */ + ++no_u_sync; resized = prepare_tagpreview(FALSE); + --no_u_sync; --RedrawingDisabled; g_do_tagpreview = 0; @@ -659,7 +663,9 @@ pum_set_selected(n, repeat) * redraw. */ if (resized) { + ++no_u_sync; win_enter(curwin_save, TRUE); + --no_u_sync; update_topline(); } @@ -670,7 +676,11 @@ pum_set_selected(n, repeat) pum_do_redraw = FALSE; if (!resized && win_valid(curwin_save)) + { + ++no_u_sync; win_enter(curwin_save, TRUE); + --no_u_sync; + } /* May need to update the screen again when there are * autocommands involved. */ -- cgit v1.2.1