From 9c0c337d7bff3b9e455c463d1b0217d294a43f57 Mon Sep 17 00:00:00 2001 From: Bram Moolenaar Date: Wed, 10 Mar 2010 14:13:55 +0000 Subject: [PATCH] [7.2.390] In some situations the popup menu can be displayed wrong. Problem: In some situations the popup menu can be displayed wrong. Solution: Remove the popup menu if the cursor moved. (Lech Lorens) Patch 7.2.390 --- src/edit.c | 8 ++++++++ src/version.c | 2 ++ 2 files changed, 10 insertions(+) diff --git a/src/edit.c b/src/edit.c index 43058f8b..33e580f1 100644 --- a/src/edit.c +++ b/src/edit.c @@ -4684,6 +4684,7 @@ ins_complete(c) int startcol = 0; /* column where searched text starts */ colnr_T curs_col; /* cursor column */ int n; + int save_w_wrow; compl_direction = ins_compl_key2dir(c); if (!compl_started) @@ -5067,6 +5068,7 @@ ins_complete(c) /* * Find next match (and following matches). */ + save_w_wrow = curwin->w_wrow; n = ins_compl_next(TRUE, ins_compl_key2count(c), ins_compl_use_match(c)); /* may undisplay the popup menu */ @@ -5220,6 +5222,12 @@ ins_complete(c) /* RedrawingDisabled may be set when invoked through complete(). */ n = RedrawingDisabled; RedrawingDisabled = 0; + + /* If the cursor moved we need to remove the pum first. */ + setcursor(); + if (save_w_wrow != curwin->w_wrow) + ins_compl_del_pum(); + ins_compl_show_pum(); setcursor(); RedrawingDisabled = n; diff --git a/src/version.c b/src/version.c index 109532e7..18f3ba5c 100644 --- a/src/version.c +++ b/src/version.c @@ -682,6 +682,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 390, +/**/ 389, /**/ 388, -- 2.11.4.GIT