summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2015-03-31 19:18:00 +0200
committerBram Moolenaar <Bram@vim.org>2015-03-31 19:18:00 +0200
commit478c46e50fd94f270369ec1c5f76aa65af7ee671 (patch)
tree6be46661fc1570ed1a5d31ca4c4825b2e3f7b5ad
parent1e7813a1872df80eec1760bdd9d80352b306ac56 (diff)
updated for version 7.4.688v7.4.688
Problem: When "$" is in 'cpo' the popup menu isn't undrawn correctly. (Issue 166) Solution: When using the popup menu remove the "$".
-rw-r--r--src/edit.c4
-rw-r--r--src/version.c2
2 files changed, 6 insertions, 0 deletions
diff --git a/src/edit.c b/src/edit.c
index 75fe691724..76bfcfb974 100644
--- a/src/edit.c
+++ b/src/edit.c
@@ -3008,6 +3008,10 @@ ins_compl_show_pum()
if (compl_match_array != NULL)
{
+ /* In Replace mode when a $ is displayed at the end of the line only
+ * part of the screen would be updated. We do need to redraw here. */
+ dollar_vcol = -1;
+
/* Compute the screen column of the start of the completed text.
* Use the cursor to get all wrapping and other settings right. */
col = curwin->w_cursor.col;
diff --git a/src/version.c b/src/version.c
index dcecdc451c..70f57bced5 100644
--- a/src/version.c
+++ b/src/version.c
@@ -742,6 +742,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 688,
+/**/
687,
/**/
686,