# HG changeset patch # User Christian Brabandt # Date 1454193904 -3600 # Node ID 6669966db9e95909325f6c3ea2caab6a31618e66 # Parent 7f160134eb4724c83192b35cf6e3b637f92f60bd commit https://github.com/vim/vim/commit/937204a9175d0fe2f13c8bc4ebeb043003d7e7d7 Author: Bram Moolenaar Date: Sat Jan 30 23:37:38 2016 +0100 patch 7.4.1219 Problem: Build fails with +channel but without +float. Solution: Add #ifdef. diff --git a/src/ex_cmds.c b/src/ex_cmds.c --- 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 --- 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,