kevin/neovim
1
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2024-12-20 03:05:11 -07:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4263 from watiko/vim-7.4.901

Browse Source 
vim-patch:7.4.901
This commit is contained in:
Justin M. Keyes 2016-02-22 01:03:51 -05:00
commit 44179d7444
2 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/nvim/popupmnu.c
View File

@ -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

2
src/nvim/version.c
View File

@ -389,7 +389,7 @@ static int included_patches[] = {
// 904,
903,
// 902 NA
// 901,
901,
// 900 NA
// 899 NA
898,