diff options
author | Bram Moolenaar <Bram@vim.org> | 2016-08-16 19:21:11 +0200 |
---|---|---|
committer | Bram Moolenaar <Bram@vim.org> | 2016-08-16 19:21:11 +0200 |
commit | 13d216d30224f12ed5bfed71216a80715b32aeff (patch) | |
tree | 4bab562ee4204e44668b467eb5b92c0491ab4c36 | |
parent | dc1f1645cb495fa6bfbe216d7359f23539a0e25d (diff) | |
download | vim-git-13d216d30224f12ed5bfed71216a80715b32aeff.tar.gz |
patch 7.4.2218v7.4.2218
Problem: Can't build with +timers when +digraph is not included.
Solution: Change #ifdef for e_number_exp. (Damien)
-rw-r--r-- | src/globals.h | 2 | ||||
-rw-r--r-- | src/version.c | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/src/globals.h b/src/globals.h index ec6e15291..16fd53fa5 100644 --- 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 fc9a880e8..bae215378 100644 --- a/src/version.c +++ b/src/version.c @@ -764,6 +764,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 2218, +/**/ 2217, /**/ 2216, |