summaryrefslogtreecommitdiff
path: root/src/screen.c
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2019-06-09 18:04:28 +0200
committerBram Moolenaar <Bram@vim.org>2019-06-09 18:04:28 +0200
commitac2450a9a863f02a5e749f2b7058157cbf76edf8 (patch)
treef7b20a5e22260aac0c784da94aa1a4bcf040c8b4 /src/screen.c
parent80dad48c5095d30873a42ec82628bdb213125d8e (diff)
downloadvim-git-ac2450a9a863f02a5e749f2b7058157cbf76edf8.tar.gz
patch 8.1.1511: matches in a popup window are not displayed properlyv8.1.1511
Problem: Matches in a popup window are not displayed properly. Solution: Do display matches in a popup window. (closes #4517)
Diffstat (limited to 'src/screen.c')
-rw-r--r--src/screen.c9
1 files changed, 4 insertions, 5 deletions
diff --git a/src/screen.c b/src/screen.c
index 0a93f86ad..fae9fe7eb 100644
--- a/src/screen.c
+++ b/src/screen.c
@@ -3957,12 +3957,11 @@ win_line(
/*
* Handle highlighting the last used search pattern and matches.
* Do this for both search_hl and the match list.
- * Not in a popup window.
+ * Do not use search_hl in a popup window.
*/
cur = wp->w_match_head;
- shl_flag = FALSE;
- while ((cur != NULL || shl_flag == FALSE) && !number_only
- && !(screen_line_flags & SLF_POPUP))
+ shl_flag = (screen_line_flags & SLF_POPUP);
+ while ((cur != NULL || shl_flag == FALSE) && !number_only)
{
if (shl_flag == FALSE)
{
@@ -4438,7 +4437,7 @@ win_line(
*/
v = (long)(ptr - line);
cur = wp->w_match_head;
- shl_flag = FALSE;
+ shl_flag = (screen_line_flags & SLF_POPUP);
while (cur != NULL || shl_flag == FALSE)
{
if (shl_flag == FALSE