# HG changeset patch # User Bram Moolenaar # Date 1569445203 -7200 # Node ID 8d7899bd6bca960c854ce7026932784d99253b9a # Parent a197c50f034e8e0daecd72c8d14820d1e5ec6cf6 patch 8.1.2078: build error with +textprop but without +terminal Commit: https://github.com/vim/vim/commit/f21118e4a9255366bb4c484d2d0428bcba07cfce Author: Bram Moolenaar Date: Wed Sep 25 22:45:45 2019 +0200 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 --- a/src/popupwin.c +++ b/src/popupwin.c @@ -1638,11 +1638,13 @@ popup_create(typval_T *argvars, typval_T 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 --- a/src/version.c +++ b/src/version.c @@ -758,6 +758,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 2078, +/**/ 2077, /**/ 2076,