patch 8.1.2078: build error with +textprop but without +terminal

Problem:    Build error with +textprop but without +terminal. (Tony Mechelynck)
Solution:   Add #ifdef.

diff --git a/src/popupwin.c b/src/popupwin.c
index 5425d09bb8480c9822aceebf72ee9d2d36060898..d4b3d7c338146bf3ae7d937dadd691610ab32b55 100644 (file)
--- 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 401c18d60f4336f344195b5970981c9c744ab8f9..af7ee239423fb983115f2d89eb1d9c392b4dc07b 100644 (file)
--- 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,
 /**/