diff options
| author | Justin M. Keyes <justinkz@gmail.com> | 2014-09-19 16:09:00 -0400 |
|---|---|---|
| committer | Justin M. Keyes <justinkz@gmail.com> | 2014-09-19 16:09:00 -0400 |
| commit | 8eef40deafdb373c271edf2d8ac6be22b7451523 (patch) | |
| tree | 4670f6fd659e88d3126e3ecbc5582cbdd11b83b9 /src | |
| parent | 6cc6b0ff9eb5bba50d125199b984cb1a374e4f77 (diff) | |
| parent | 3654cce0bf1ca0a2e015326c1c2ed2e97f3c9692 (diff) | |
| download | rneovim-8eef40deafdb373c271edf2d8ac6be22b7451523.tar.gz rneovim-8eef40deafdb373c271edf2d8ac6be22b7451523.tar.bz2 rneovim-8eef40deafdb373c271edf2d8ac6be22b7451523.zip | |
Merge pull request #1187 from Shougo/vim-patch-7.4.361
vim-patch:7.4.361
Diffstat (limited to 'src')
| -rw-r--r-- | src/nvim/popupmnu.c | 2 | ||||
| -rw-r--r-- | src/nvim/version.c | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/src/nvim/popupmnu.c b/src/nvim/popupmnu.c index f4e60ddde9..19b92c5789 100644 --- a/src/nvim/popupmnu.c +++ b/src/nvim/popupmnu.c @@ -541,7 +541,9 @@ static int pum_set_selected(int n, int repeat) if ((p_pvh > 0) && (p_pvh < g_do_tagpreview)) { g_do_tagpreview = p_pvh; } + RedrawingDisabled++; resized = prepare_tagpreview(false); + RedrawingDisabled--; g_do_tagpreview = 0; if (curwin->w_p_pvw) { diff --git a/src/nvim/version.c b/src/nvim/version.c index f80b2f8a41..5efd2d500c 100644 --- a/src/nvim/version.c +++ b/src/nvim/version.c @@ -234,7 +234,7 @@ static int included_patches[] = { //364, //363, 362, - //361, + 361, //360, //359, 358, |