From: Bram Moolenaar <Bram@vim.org>
Date: Sat, 30 Jan 2016 22:37:38 +0000 (+0100)
Subject: patch 7.4.1219
X-Git-Tag: v7.4.1219
X-Git-Url: http://git.ipfire.org/gitweb/?a=commitdiff_plain;h=937204a9175d0fe2f13c8bc4ebeb043003d7e7d7;p=thirdparty%2Fvim.git

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 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
@@ -746,6 +746,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1219,
 /**/
     1218,
 /**/