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
index 9b2a1932fd34c493b7e83bf30805cda9f6c22fa7..ba3efac9bb9824e82d24db82505742d8aa0676ca 100644 (file)
--- 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 dd2f95d482a17dd29dbc6d47a6554f0a0f38188d..1eab3eea52a7dbc452ff77a9ea9fc668011890c2 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -746,6 +746,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1219,
 /**/
     1218,
 /**/