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)

diff --git a/src/popupmnu.c b/src/popupmnu.c
index 68ee2d5623a5721f99b216d87ac686e6d00013a8..2f5e7dc811034a0b6d94dfba32bd5d398ac4f5af 100644 (file)
--- 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. */

diff --git a/src/version.c b/src/version.c
index 775b027f1516b1fa6ec9461743aa3dd5a3137737..61e0bf0e51e1942c2e5239d5d63e8331dce2e698 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -741,6 +741,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    901,
 /**/
     900,
 /**/