changeset 7844:6669966db9e9 v7.4.1219

commit https://github.com/vim/vim/commit/937204a9175d0fe2f13c8bc4ebeb043003d7e7d7 Author: Bram Moolenaar <Bram@vim.org> Date: Sat Jan 30 23:37:38 2016 +0100 patch 7.4.1219 Problem: Build fails with +channel but without +float. Solution: Add #ifdef.
author Christian Brabandt <cb@256bit.org>
date Sat, 30 Jan 2016 23:45:04 +0100
parents 7f160134eb47
children e53c47128ccf
files src/ex_cmds.c src/version.c
diffstat 2 files changed, 7 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- 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 */
--- 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,