diff options
| author | Shougo Matsushita <Shougo.Matsu@gmail.com> | 2014-09-18 20:19:03 +0900 |
|---|---|---|
| committer | Shougo Matsushita <Shougo.Matsu@gmail.com> | 2014-09-18 20:19:03 +0900 |
| commit | 693bf89f2a13c9a8ed58655bbe7b0ee3536ac98c (patch) | |
| tree | 682052dc354af2857f9f873036df25feb7ac8695 /src | |
| parent | a447160a6ca43181158bce8117f2af37f4e9fc85 (diff) | |
| download | rneovim-693bf89f2a13c9a8ed58655bbe7b0ee3536ac98c.tar.gz rneovim-693bf89f2a13c9a8ed58655bbe7b0ee3536ac98c.tar.bz2 rneovim-693bf89f2a13c9a8ed58655bbe7b0ee3536ac98c.zip | |
vim-patch:7.4.383
Problem: Bad interaction between preview window and omnifunc.
Solution: Avoid redrawing the status line. (Hirohito Higashi)
https://code.google.com/p/vim/source/detail?r=v7-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 fa96b27341..27b5625a4d 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 |