Mercurial > vim
changeset 16802:f5487021fdad v8.1.1403
patch 8.1.1403: cannot build without the timer feature
commit https://github.com/vim/vim/commit/35d5af6c0b618aef9ca87b05b2e184934e47d916
Author: Bram Moolenaar <Bram@vim.org>
Date: Sun May 26 20:44:10 2019 +0200
patch 8.1.1403: cannot build without the timer feature
Problem: Cannot build without the timer feature.
Solution: Add #ifdef.
author | Bram Moolenaar <Bram@vim.org> |
---|---|
date | Sun, 26 May 2019 20:45:05 +0200 |
parents | 2d9d64daf580 |
children | 2490583b9685 |
files | src/popupwin.c src/structs.h src/testdir/test_popupwin.vim src/version.c src/window.c |
diffstat | 5 files changed, 14 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/src/popupwin.c +++ b/src/popupwin.c @@ -30,6 +30,7 @@ apply_options(win_T *wp, buf_T *buf UNUS wp->w_wincol = dict_get_number(dict, (char_u *)"col"); wp->w_zindex = dict_get_number(dict, (char_u *)"zindex"); +#if defined(FEAT_TIMERS) // Add timer to close the popup after some time. nr = dict_get_number(dict, (char_u *)"time"); if (nr > 0) @@ -49,6 +50,7 @@ apply_options(win_T *wp, buf_T *buf UNUS wp->w_popup_timer->tr_partial = tv.vval.v_partial; } } +#endif }
--- a/src/structs.h +++ b/src/structs.h @@ -2874,7 +2874,9 @@ struct window_S int w_zindex; int w_maxheight; // "maxheight" for popup window int w_maxwidth; // "maxwidth" for popup window +# if defined(FEAT_TIMERS) timer_T *w_popup_timer; // timer for closing popup window +# endif #endif
--- a/src/testdir/test_popupwin.vim +++ b/src/testdir/test_popupwin.vim @@ -39,6 +39,9 @@ func Test_simple_popup() endfunc func Test_popup_time() + if !has('timers') + return + endif topleft vnew call setline(1, 'hello') @@ -52,6 +55,7 @@ func Test_popup_time() call assert_equal('world', line) sleep 700m + redraw let line = join(map(range(1, 5), 'screenstring(1, v:val)'), '') call assert_equal('hello', line)
--- a/src/version.c +++ b/src/version.c @@ -768,6 +768,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 1403, +/**/ 1402, /**/ 1401,
--- a/src/window.c +++ b/src/window.c @@ -4859,6 +4859,7 @@ win_unlisted(win_T *wp) return wp == aucmd_win || bt_popup(wp->w_buffer); } +#if defined(FEAT_TEXT_PROP) || defined(PROTO) /* * Free a popup window. This does not take the window out of the window list * and assumes there is only one toplevel frame, no split. @@ -4867,11 +4868,14 @@ win_unlisted(win_T *wp) win_free_popup(win_T *win) { win_close_buffer(win, TRUE, FALSE); +# if defined(FEAT_TIMERS) if (win->w_popup_timer != NULL) stop_timer(win->w_popup_timer); +# endif vim_free(win->w_frame); win_free(win, NULL); } +#endif /* * Append window "wp" in the window list after window "after".