diff options
| author | Bram Moolenaar <Bram@vim.org> | 2016-01-30 23:37:38 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2016-01-30 23:37:38 +0100 |
| commit | 937204a9175d0fe2f13c8bc4ebeb043003d7e7d7 (patch) | |
| tree | 7127f5e25cc3740a39ed53e66ac8238afd48f346 | |
| parent | 779a7759ad03e6a3fb616828793512644390655a (diff) | |
patch 7.4.1219v7.4.1219
Problem: Build fails with +channel but without +float.
Solution: Add #ifdef.
| -rw-r--r-- | src/ex_cmds.c | 6 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 7 insertions, 1 deletions
diff --git a/src/ex_cmds.c b/src/ex_cmds.c index 9b2a1932fd..ba3efac9bb 100644 --- a/src/ex_cmds.c +++ b/src/ex_cmds.c @@ -520,7 +520,11 @@ ex_sort(exarg_T *eap) if (regmatch.regprog != NULL) end_col = 0; - if (sort_nr || sort_flt) + if (sort_nr +#ifdef FEAT_FLOAT + || sort_flt +#endif + ) { /* Make sure vim_str2nr doesn't read any digits past the end * of the match, by temporarily terminating the string there */ diff --git a/src/version.c b/src/version.c index dd2f95d482..1eab3eea52 100644 --- a/src/version.c +++ b/src/version.c @@ -747,6 +747,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 1219, +/**/ 1218, /**/ 1217, |