thac0/vim
1
0
Fork 0
forked from aniani/vim
Code Activity

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

Browse Source 
Problem:    Build error with +textprop but without +terminal. (Tony Mechelynck)
Solution:   Add #ifdef.
This commit is contained in:
Bram Moolenaar
2019-09-25 22:45:45 +02:00
parent 4aea03eb87
commit f21118e4a9
2 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/popupwin.c
View File

@@ -1638,11 +1638,13 @@ popup_create(typval_T *argvars, typval_T *rettv, create_type_T type)
semsg(_(e_nobufnr), argvars[0].vval.v_number); semsg(_(e_nobufnr), argvars[0].vval.v_number);
return NULL; return NULL;
} }
#ifdef FEAT_TERMINAL
if (buf->b_term != NULL) if (buf->b_term != NULL)
{ {
emsg(_("E278: Cannot put a terminal buffer in a popup window")); emsg(_("E278: Cannot put a terminal buffer in a popup window"));
return NULL; return NULL;
} }
#endif
} }
else if (!(argvars[0].v_type == VAR_STRING else if (!(argvars[0].v_type == VAR_STRING
&& argvars[0].vval.v_string != NULL) && argvars[0].vval.v_string != NULL)

2
src/version.c
View File

@@ -757,6 +757,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
2078,
/**/ /**/
2077, 2077,
/**/ /**/