diff options
| author | Bram Moolenaar <Bram@vim.org> | 2019-09-25 22:45:45 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2019-09-25 22:45:45 +0200 |
| commit | f21118e4a9255366bb4c484d2d0428bcba07cfce (patch) | |
| tree | e60351e34334fe8709a2b960ea096f0f3fe664e3 | |
| parent | 4aea03eb875613e3eae2125b84f02b7cd898b2f8 (diff) | |
| download | vim-git-f21118e4a9255366bb4c484d2d0428bcba07cfce.tar.gz | |
patch 8.1.2078: build error with +textprop but without +terminalv8.1.2078
Problem: Build error with +textprop but without +terminal. (Tony Mechelynck)
Solution: Add #ifdef.
| -rw-r--r-- | src/popupwin.c | 2 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 4 insertions, 0 deletions
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 @@ -758,6 +758,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 2078, +/**/ 2077, /**/ 2076, |