summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2014-07-23 21:10:43 +0200
committerBram Moolenaar <Bram@vim.org>2014-07-23 21:10:43 +0200
commit2bace3e2fb9dd138bd267bbf648e4473dba6eb2c (patch)
tree279398df02ad6dc5ebb1c8b6082f27a466d55370
parent20c3892e545da821ad22cc266d7c49f904bbf333 (diff)
updated for version 7.4.383v7.4.383
Problem: Bad interaction between preview window and omnifunc. Solution: Avoid redrawing the status line. (Hirohito Higashi)
-rw-r--r--src/popupmnu.c6
-rw-r--r--src/version.c2
2 files changed, 8 insertions, 0 deletions
diff --git a/src/popupmnu.c b/src/popupmnu.c
index b970158b27..68ee2d5623 100644
--- a/src/popupmnu.c
+++ b/src/popupmnu.c
@@ -643,6 +643,12 @@ pum_set_selected(n, repeat)
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/version.c b/src/version.c
index c071073379..663bdfd12c 100644
--- a/src/version.c
+++ b/src/version.c
@@ -735,6 +735,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 383,
+/**/
382,
/**/
381,