aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJan Edmund Lazo <jan.lazo@mail.utoronto.ca>2020-10-07 19:47:36 -0400
committerJan Edmund Lazo <jan.lazo@mail.utoronto.ca>2020-10-08 18:31:46 -0400
commitd5bc62a5ce6033581b98103c986e01fe91f0c454 (patch)
treefd975a2e7f86e4702a22513e9de32ca90604b9ec
parentca6815115c79da62b845f479f0cdd765bdbfb700 (diff)
downloadrneovim-d5bc62a5ce6033581b98103c986e01fe91f0c454.tar.gz
rneovim-d5bc62a5ce6033581b98103c986e01fe91f0c454.tar.bz2
rneovim-d5bc62a5ce6033581b98103c986e01fe91f0c454.zip
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
-rw-r--r--src/nvim/screen.c2
1 files changed, 1 insertions, 1 deletions
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