diff options
| author | Bram Moolenaar <Bram@vim.org> | 2017-06-25 13:40:17 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2017-06-25 13:40:17 +0200 |
| commit | 5d7be4f0fa04a9210a14fca69b4f9e34613b378f (patch) | |
| tree | 87efa129edadf4a11f6cd24a8987ee8e81e7d20b | |
| parent | ea20de81462a7e1a7f8fc1d53ad618efb0663c17 (diff) | |
| download | vim-git-5d7be4f0fa04a9210a14fca69b4f9e34613b378f.tar.gz | |
patch 8.0.0674: cannot build with eval but without timersv8.0.0674
Problem: Cannot build with eval but without timers.
Solution: Add #ifdef (John Marriott)
| -rw-r--r-- | src/evalfunc.c | 6 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 7 insertions, 1 deletions
diff --git a/src/evalfunc.c b/src/evalfunc.c index 581ad7b5b..ac232a3b3 100644 --- a/src/evalfunc.c +++ b/src/evalfunc.c @@ -3191,7 +3191,11 @@ f_feedkeys(typval_T *argvars, typval_T *rettv UNUSED) ins_typebuf(keys_esc, (remap ? REMAP_YES : REMAP_NONE), insert ? 0 : typebuf.tb_len, !typed, FALSE); vim_free(keys_esc); - if (vgetc_busy || timer_busy) + if (vgetc_busy +#ifdef FEAT_TIMERS + || timer_busy +#endif + ) typebuf_was_filled = TRUE; if (execute) { diff --git a/src/version.c b/src/version.c index b9f309d21..fa4f6fb04 100644 --- a/src/version.c +++ b/src/version.c @@ -765,6 +765,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 674, +/**/ 673, /**/ 672, |