From 0fcf26ba4ffaaa6a2fb8d879dc24b5f7e1bb6a13 Mon Sep 17 00:00:00 2001 From: Bram Moolenaar Date: Sun, 23 Jun 2019 01:03:51 +0200 Subject: patch 8.1.1582: cannot build with +textprop but without +timers MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Problem: Cannot build with +textprop but without +timers. Solution: Add #ifdef. (Ola Söder, closes #4574) --- src/popupwin.c | 2 ++ src/version.c | 2 ++ 2 files changed, 4 insertions(+) diff --git a/src/popupwin.c b/src/popupwin.c index b0b67b191..d675a4484 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 042c9c123..2af29122c 100644 --- a/src/version.c +++ b/src/version.c @@ -777,6 +777,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ +/**/ + 1582, /**/ 1581, /**/ -- cgit v1.2.1