changeset 18166:8d7899bd6bca v8.1.2078

patch 8.1.2078: build error with +textprop but without +terminal Commit: https://github.com/vim/vim/commit/f21118e4a9255366bb4c484d2d0428bcba07cfce Author: Bram Moolenaar <Bram@vim.org> 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.
author Bram Moolenaar <Bram@vim.org>
date Wed, 25 Sep 2019 23:00:03 +0200
parents a197c50f034e
children 92c6fc446c6f
files src/popupwin.c src/version.c
diffstat 2 files changed, 4 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- 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)
--- 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,