From f21118e4a9255366bb4c484d2d0428bcba07cfce Mon Sep 17 00:00:00 2001 From: Bram Moolenaar Date: Wed, 25 Sep 2019 22:45:45 +0200 Subject: [PATCH] patch 8.1.2078: build error with +textprop but without +terminal Problem: Build error with +textprop but without +terminal. (Tony Mechelynck) Solution: Add #ifdef. --- src/popupwin.c | 2 ++ src/version.c | 2 ++ 2 files changed, 4 insertions(+) diff --git a/src/popupwin.c b/src/popupwin.c index 5425d09bb..d4b3d7c33 100644 --- a/src/popupwin.c +++ b/src/popupwin.c @@ -1638,11 +1638,13 @@ popup_create(typval_T *argvars, typval_T *rettv, create_type_T type) semsg(_(e_nobufnr), argvars[0].vval.v_number); return NULL; } +#ifdef FEAT_TERMINAL if (buf->b_term != NULL) { emsg(_("E278: Cannot put a terminal buffer in a popup window")); return NULL; } +#endif } else if (!(argvars[0].v_type == VAR_STRING && argvars[0].vval.v_string != NULL) diff --git a/src/version.c b/src/version.c index 401c18d60..af7ee2394 100644 --- a/src/version.c +++ b/src/version.c @@ -757,6 +757,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ +/**/ + 2078, /**/ 2077, /**/ -- 2.50.1