Merge remote-tracking branch 'vim/master'

Author: splhack

src/ex_cmds.c

@@ -14,6 +14,10 @@
 #include "vim.h"
 #include "version.h"
 
+#ifdef FEAT_FLOAT
+# include <float.h>
+#endif
+
 #ifdef FEAT_EX_EXTRA
 static int linelen __ARGS((int *has_tab));
 #endif

src/version.c

@@ -756,6 +756,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1144,
 /**/
     1143,
 /**/