summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2020-02-28 22:51:54 +0100
committerBram Moolenaar <Bram@vim.org>2020-02-28 22:51:54 +0100
commit57c732ed782607ce6a8c4f9eeb65b95a00e37701 (patch)
tree0f5623ad164ba22994ee3fe2ab971decb9bf52d2
parentec084d3356cc2a23f2f44707810c38ab590d2e66 (diff)
patch 8.2.0330: build error with popup window but without terminalv8.2.0330
Problem: Build error with popup window but without terminal. Solution: Add #ifdef.
-rw-r--r--src/popupwin.c2
-rw-r--r--src/version.c2
2 files changed, 4 insertions, 0 deletions
diff --git a/src/popupwin.c b/src/popupwin.c
index 6402ba3ad5..45d6488059 100644
--- a/src/popupwin.c
+++ b/src/popupwin.c
@@ -3506,7 +3506,9 @@ update_popups(void (*win_update)(win_T *wp))
wp->w_winrow -= top_off;
wp->w_wincol -= left_extra;
// cursor position matters in terminal in job mode
+#ifdef FEAT_TERMINAL
if (wp != curwin || !term_in_normal_mode())
+#endif
{
wp->w_wrow += top_off;
wp->w_wcol += left_extra;
diff --git a/src/version.c b/src/version.c
index ced13f84a7..b883605c69 100644
--- a/src/version.c
+++ b/src/version.c
@@ -739,6 +739,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 330,
+/**/
329,
/**/
328,