From: Bram Moolenaar <Bram@vim.org>
Date: Tue, 31 Mar 2015 17:18:00 +0000 (+0200)
Subject: updated for version 7.4.688
X-Git-Tag: v7.4.688
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=478c46e50fd94f270369ec1c5f76aa65af7ee671;p=thirdparty%2Fvim.git

updated for version 7.4.688
Problem:    When "$" is in 'cpo' the popup menu isn't undrawn correctly.
            (Issue 166)
Solution:   When using the popup menu remove the "$".
---

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
@@ -741,6 +741,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    688,
 /**/
     687,
 /**/