patch 7.4.2218

Problem:    Can't build with +timers when +digraph is not included.
Solution:   Change #ifdef for e_number_exp. (Damien)

diff --git a/src/globals.h b/src/globals.h
index ec6e1529117683779f6dbff3021d3dc67f3ca1c9..16fd53fa50741159afefbff4b047f3092539e167 100644 (file)
--- a/src/globals.h
+++ b/src/globals.h
@@ -1509,7 +1509,7 @@ EXTERN char_u e_notread[] INIT(= N_("E485: Can't read file %s"));
 EXTERN char_u e_nowrtmsg[]     INIT(= N_("E37: No write since last change (add ! to override)"));
 EXTERN char_u e_nowrtmsg_nobang[]   INIT(= N_("E37: No write since last change"));
 EXTERN char_u e_null[]         INIT(= N_("E38: Null argument"));
-#ifdef FEAT_DIGRAPHS
+#if defined(FEAT_DIGRAPHS) || defined(FEAT_TIMERS)
 EXTERN char_u e_number_exp[]   INIT(= N_("E39: Number expected"));
 #endif
 #ifdef FEAT_QUICKFIX

diff --git a/src/version.c b/src/version.c
index fc9a880e80fd7516e453b46bf228ac1ec7126a27..bae215378a6a1bf894e9aa5f10f08d4e1f242c22 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -763,6 +763,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    2218,
 /**/
     2217,
 /**/