From d5bc62a5ce6033581b98103c986e01fe91f0c454 Mon Sep 17 00:00:00 2001 From: Jan Edmund Lazo Date: Wed, 7 Oct 2020 19:47:36 -0400 Subject: vim-patch:8.1.1717: last char in menu popup window highlighted Problem: Last char in menu popup window highlighted. Solution: Do not highlight an extra character twice. https://github.com/vim/vim/commit/f914a33c9c8ec5c30da684a4a16edad3e0224f0a N/A patches for version.c: vim-patch:8.1.0746: highlighting not updated with conceal and 'cursorline' Problem: Highlighting not updated with conceal and 'cursorline'. (Jason Franklin) Solution: Do not use a zero line number. Check if 'conceallevel' is set for the current window. https://github.com/vim/vim/commit/bbee8d5122b159683b3f52eddd0da85fcf1fcbfd --- src/nvim/screen.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/nvim/screen.c') diff --git a/src/nvim/screen.c b/src/nvim/screen.c index 7c42f29a90..ea2b14c326 100644 --- a/src/nvim/screen.c +++ b/src/nvim/screen.c @@ -3690,7 +3690,7 @@ win_line ( } // At end of the text line or just after the last character. - if (c == NUL) { + if (c == NUL && eol_hl_off == 0) { long prevcol = (long)(ptr - line) - 1; // we're not really at that column when skipping some text -- cgit