Merge pull request #1193 from Shougo/vim-patch-7.4.383

vim-patch:7.4.383
This commit is contained in:
Justin M. Keyes
2014-09-18 17:51:19 -04:00
2 changed files with 9 additions and 1 deletions

View File

@@ -18,6 +18,7 @@
#include "nvim/search.h" #include "nvim/search.h"
#include "nvim/strings.h" #include "nvim/strings.h"
#include "nvim/window.h" #include "nvim/window.h"
#include "nvim/edit.h"
static pumitem_T *pum_array = NULL; // items of displayed pum static pumitem_T *pum_array = NULL; // items of displayed pum
static int pum_size; // nr of items in "pum_array" 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; curwin->w_cursor.col = 0;
if ((curwin != curwin_save) && win_valid(curwin_save)) { 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 // Return cursor to where we were
validate_cursor(); validate_cursor();
redraw_later(SOME_VALID); redraw_later(SOME_VALID);

View File

@@ -212,7 +212,7 @@ static int included_patches[] = {
//386, //386,
//385, //385,
//384 NA //384 NA
//383, 383,
//382, //382,
381, 381,
//380 NA //380 NA