From 7b955802b3c5ca32467b58e09786e40d167fd3aa Mon Sep 17 00:00:00 2001 From: watiko Date: Thu, 4 Feb 2016 03:01:46 +0900 Subject: 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 "$". https://github.com/vim/vim/commit/478c46e50fd94f270369ec1c5f76aa65af7ee671 NOTE: To reproduce in nvim: nvim -u NONE -c 'exe "norm iaaa iabbbbbb acc" | norm yyp' -c 'set cpo+=$' --- src/nvim/edit.c | 8 ++++++-- src/nvim/version.c | 2 +- 2 files changed, 7 insertions(+), 3 deletions(-) (limited to 'src') diff --git a/src/nvim/edit.c b/src/nvim/edit.c index dbbcf4f1b9..213df4f65a 100644 --- a/src/nvim/edit.c +++ b/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. - * Use the cursor to get all wrapping and other settings right. */ + // 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; curwin->w_cursor.col = compl_col; pum_display(compl_match_array, compl_match_arraysize, cur); diff --git a/src/nvim/version.c b/src/nvim/version.c index f865e13f55..ab78400736 100644 --- a/src/nvim/version.c +++ b/src/nvim/version.c @@ -600,7 +600,7 @@ static int included_patches[] = { // 691 NA 690, // 689, - // 688, + 688, // 687 NA 686, 685, -- cgit