From 02f9e6a60f9851046154ccf2ac170f25a0b3cc7d Mon Sep 17 00:00:00 2001
From: Bram Moolenaar <Bram@vim.org>
Date: Wed, 15 Jul 2020 18:27:08 +0200
Subject: [PATCH] patch 8.2.1221: memory leak when updating popup window

Problem:    Memory leak when updating popup window.
Solution:   Clear search highlighting.
---
 src/popupwin.c | 5 +++++
 src/version.c  | 2 ++
 2 files changed, 7 insertions(+)

diff --git a/src/popupwin.c b/src/popupwin.c
index 59a0bdf78..296441b11 100644
--- a/src/popupwin.c
+++ b/src/popupwin.c
@@ -3855,6 +3855,11 @@ update_popups(void (*win_update)(win_T *wp))
 	// Back to the normal zindex.
 	screen_zindex = 0;
     }
+
+#if defined(FEAT_SEARCH_EXTRA)
+    // In case win_update() called start_search_hl().
+    end_search_hl();
+#endif
 }
 
 /*
diff --git a/src/version.c b/src/version.c
index 424234b9a..f0cfe69a3 100644
--- a/src/version.c
+++ b/src/version.c
@@ -754,6 +754,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1221,
 /**/
     1220,
 /**/
-- 
2.50.1