diff options
author | Bram Moolenaar <Bram@vim.org> | 2016-06-11 22:21:17 +0200 |
---|---|---|
committer | Bram Moolenaar <Bram@vim.org> | 2016-06-11 22:21:17 +0200 |
commit | 724f2edf75bf084665b3e2cdfa7ab66ccb1b5c0c (patch) | |
tree | 62dbc146d1712c7f566ca3abea4eb2d0f958c396 | |
parent | e80ff7448d886805b459250b090aaa20d96e8c2b (diff) | |
download | vim-git-724f2edf75bf084665b3e2cdfa7ab66ccb1b5c0c.tar.gz |
patch 7.4.1921v7.4.1921
Problem: vim_time() not included when needed.
Solution: Adjust #ifdef.
-rw-r--r-- | src/ex_cmds.c | 2 | ||||
-rw-r--r-- | src/version.c | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/src/ex_cmds.c b/src/ex_cmds.c index 893a5ae35..b3b920939 100644 --- a/src/ex_cmds.c +++ b/src/ex_cmds.c @@ -2818,7 +2818,7 @@ write_viminfo_barlines(vir_T *virp, FILE *fp_out) } #endif /* FEAT_VIMINFO */ -#if defined(FEAT_VIMINFO) || defined(PROTO) +#if defined(FEAT_CMDHIST) || defined(FEAT_VIMINFO) || defined(PROTO) /* * Return the current time in seconds. Calls time(), unless test_settime() * was used. diff --git a/src/version.c b/src/version.c index af8d684b0..6dc2efb57 100644 --- a/src/version.c +++ b/src/version.c @@ -754,6 +754,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 1921, +/**/ 1920, /**/ 1919, |