vim-patch:7.4.688 #4159

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

478c46e50f

NOTE: To reproduce in nvim:
    nvim -u NONE -c 'exe "norm iaaa iabbbbbb acc" | norm yyp' -c 'set cpo+=$'

src/nvim/edit.c

@@ -2548,8 +2548,12 @@ void ins_compl_show_pum(void)
       }
   }
 
-  /* Compute the screen column of the start of the completed text.
+  // In Replace mode when a $ is displayed at the end of the line only
-   * Use the cursor to get all wrapping and other settings right. */
+  // 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;
   curwin->w_cursor.col = compl_col;
   pum_display(compl_match_array, compl_match_arraysize, cur);

src/nvim/version.c

@@ -600,7 +600,7 @@ static int included_patches[] = {
   // 691 NA
   690,
   // 689,
-  // 688,
+  688,
   // 687 NA
   686,
   685,