commit 724f2edf75bf084665b3e2cdfa7ab66ccb1b5c0c
author Bram Moolenaar <Bram@vim.org> Sat Jun 11 22:21:17 2016 +0200
committer Bram Moolenaar <Bram@vim.org> Sat Jun 11 22:21:17 2016 +0200
tree 62dbc146d1712c7f566ca3abea4eb2d0f958c396
parent e80ff7448d886805b459250b090aaa20d96e8c2b

patch 7.4.1921
Problem:    vim_time() not included when needed.
Solution:   Adjust #ifdef.

src/ex_cmds.c

diff --git a/src/ex_cmds.c b/src/ex_cmds.c
index 893a5ae..b3b9209 100644
--- a/src/ex_cmds.c
+++ b/src/ex_cmds.c
@@ -2818,7 +2818,7 @@
 }
 #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.

src/version.c

diff --git a/src/version.c b/src/version.c
index af8d684..6dc2efb 100644
--- a/src/version.c
+++ b/src/version.c
@@ -754,6 +754,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    1921,
+/**/
     1920,
 /**/
     1919,