diff options
| author | Justin M. Keyes <justinkz@gmail.com> | 2014-09-18 17:51:19 -0400 |
|---|---|---|
| committer | Justin M. Keyes <justinkz@gmail.com> | 2014-09-18 17:51:19 -0400 |
| commit | 67a16384a46c5eb51ba43d9150e95a1742cffbde (patch) | |
| tree | a775095dedc6f4b92ee738a7c631b859b9c770d6 /src | |
| parent | fe446c86cf752961fab84f92aa4956aaa4dc3f6f (diff) | |
| parent | 693bf89f2a13c9a8ed58655bbe7b0ee3536ac98c (diff) | |
| download | rneovim-67a16384a46c5eb51ba43d9150e95a1742cffbde.tar.gz rneovim-67a16384a46c5eb51ba43d9150e95a1742cffbde.tar.bz2 rneovim-67a16384a46c5eb51ba43d9150e95a1742cffbde.zip | |
Merge pull request #1193 from Shougo/vim-patch-7.4.383
vim-patch:7.4.383
Diffstat (limited to 'src')
| -rw-r--r-- | src/nvim/popupmnu.c | 8 | ||||
| -rw-r--r-- | src/nvim/version.c | 2 |
2 files changed, 9 insertions, 1 deletions
diff --git a/src/nvim/popupmnu.c b/src/nvim/popupmnu.c index 184285b5f6..f4e60ddde9 100644 --- a/src/nvim/popupmnu.c +++ b/src/nvim/popupmnu.c @@ -18,6 +18,7 @@ #include "nvim/search.h" #include "nvim/strings.h" #include "nvim/window.h" +#include "nvim/edit.h" static pumitem_T *pum_array = NULL; // items of displayed pum static int pum_size; // nr of items in "pum_array" @@ -607,6 +608,13 @@ static int pum_set_selected(int n, int repeat) curwin->w_cursor.col = 0; if ((curwin != curwin_save) && win_valid(curwin_save)) { + // When the first completion is done and the preview + // window is not resized, skip the preview window's + // status line redrawing. + if (ins_compl_active() && !resized) { + curwin->w_redr_status = FALSE; + } + // Return cursor to where we were validate_cursor(); redraw_later(SOME_VALID); diff --git a/src/nvim/version.c b/src/nvim/version.c index cd4ccfa813..e80c1f81a1 100644 --- a/src/nvim/version.c +++ b/src/nvim/version.c @@ -212,7 +212,7 @@ static int included_patches[] = { //386, //385, //384 NA - //383, + 383, //382, 381, //380 NA |