Merge pull request #4263 from watiko/vim-7.4.901

vim-patch:7.4.901

2 files changed, 9 insertions, 1 deletions

diff --git a/src/nvim/popupmnu.c b/src/nvim/popupmnu.c
index 001740943f..5ad621e666 100644
--- a/src/nvim/popupmnu.c
+++ b/src/nvim/popupmnu.c
@@ -545,7 +545,11 @@ static int pum_set_selected(int n, int repeat)
         g_do_tagpreview = (int)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;
 
@@ -629,7 +633,9 @@ static int pum_set_selected(int n, int repeat)
             // the window when needed, otherwise it will always be
             // redraw.
             if (resized) {
+              no_u_sync++;
               win_enter(curwin_save, true);
+              no_u_sync--;
               update_topline();
             }
 
@@ -640,7 +646,9 @@ static int pum_set_selected(int n, int 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
diff --git a/src/nvim/version.c b/src/nvim/version.c
index d71a36261a..8b756faa35 100644
--- a/src/nvim/version.c
+++ b/src/nvim/version.c
@@ -389,7 +389,7 @@ static int included_patches[] = {
   // 904,
   903,
   // 902 NA
-  // 901,
+  901,
   // 900 NA
   // 899 NA
   898,