patch 7.4.1921

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

diff --git a/src/ex_cmds.c b/src/ex_cmds.c
index 893a5ae350ee907d87b8a2cac596240999de20ab..b3b920939d3483934915795be9bf3492b42deab4 100644 (file)
--- 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 af8d684b0d058b78dd4b21575bdf5799eae4dd60..6dc2efb57f527edf0f48a1cf938d0c1e8de8031d 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -753,6 +753,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1921,
 /**/
     1920,
 /**/