diff options
| author | Bram Moolenaar <Bram@vim.org> | 2019-06-23 01:03:51 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2019-06-23 01:03:51 +0200 |
| commit | 0fcf26ba4ffaaa6a2fb8d879dc24b5f7e1bb6a13 (patch) | |
| tree | ca53f6be2222dbb055c5db237e4c38e4323617af | |
| parent | 7a39dd7f00239059ce34660611589b26126a550c (diff) | |
patch 8.1.1582: cannot build with +textprop but without +timersv8.1.1582
Problem: Cannot build with +textprop but without +timers.
Solution: Add #ifdef. (Ola Söder, closes #4574)
| -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 b0b67b1919..d675a4484a 100644 --- a/src/popupwin.c +++ b/src/popupwin.c @@ -1051,8 +1051,10 @@ popup_create(typval_T *argvars, typval_T *rettv, create_type_T type) // Deal with options. apply_options(wp, argvars[1].vval.v_dict); +#ifdef FEAT_TIMERS if (type == TYPE_NOTIFICATION && wp->w_popup_timer == NULL) popup_add_timeout(wp, 3000); +#endif popup_adjust_position(wp); diff --git a/src/version.c b/src/version.c index 042c9c123b..2af29122c2 100644 --- a/src/version.c +++ b/src/version.c @@ -778,6 +778,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 1582, +/**/ 1581, /**/ 1580, |