From 12c4492dd35e0cd83c8816be2ec849b836109882 Mon Sep 17 00:00:00 2001
From: Bram Moolenaar <Bram@vim.org>
Date: Sun, 8 Jan 2017 13:26:03 +0100
Subject: [PATCH 01/10] patch 8.0.0151: passing buffer content to system() is
 clumsy

Problem:    To pass buffer content to system() and systemlist() one has to
            first create a string or list.
Solution:   Allow passing a buffer number. (LemonBoy, closes #1240)
---
 runtime/doc/eval.txt        |  6 +++++-
 src/Makefile                |  1 +
 src/evalfunc.c              | 35 +++++++++++++++++++++++++++++++----
 src/testdir/Make_all.mak    |  1 +
 src/testdir/test_system.vim | 20 ++++++++++++++++++++
 src/version.c               |  2 ++
 6 files changed, 60 insertions(+), 5 deletions(-)
 create mode 100644 src/testdir/test_system.vim

diff --git a/runtime/doc/eval.txt b/runtime/doc/eval.txt
index 1f54372e97..f5ea0780a9 100644
--- a/runtime/doc/eval.txt
+++ b/runtime/doc/eval.txt
@@ -7561,7 +7561,11 @@ system({expr} [, {input}])				*system()* *E677*
 		If {input} is given and is a |List| it is written to the file
 		in a way |writefile()| does with {binary} set to "b" (i.e.
 		with a newline between each list item with newlines inside
-		list items converted to NULs).  
+		list items converted to NULs).
+		When {input} is given and is a number that is a valid id for
+		an existing buffer then the content of the buffer is written
+		to the file line by line, each line terminated by a NL and
+		NULs characters where the text has a NL.
 
 		Pipes are not used, the 'shelltemp' option is not used.
 
diff --git a/src/Makefile b/src/Makefile
index 4b29ae118f..3f61de6526 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -2164,6 +2164,7 @@ test_arglist \
 	test_substitute \
 	test_syn_attr \
 	test_syntax \
+	test_system \
 	test_tabline \
 	test_tabpage \
 	test_tagcase \
diff --git a/src/evalfunc.c b/src/evalfunc.c
index 10f6b182e7..f66fa9a8e1 100644
--- a/src/evalfunc.c
+++ b/src/evalfunc.c
@@ -11817,7 +11817,6 @@ get_cmd_output_as_rettv(
     char_u	*res = NULL;
     char_u	*p;
     char_u	*infile = NULL;
-    char_u	buf[NUMBUFLEN];
     int		err = FALSE;
     FILE	*fd;
     list_T	*list = NULL;
@@ -11831,7 +11830,7 @@ get_cmd_output_as_rettv(
     if (argvars[1].v_type != VAR_UNKNOWN)
     {
 	/*
-	 * Write the string to a temp file, to be used for input of the shell
+	 * Write the text to a temp file, to be used for input of the shell
 	 * command.
 	 */
 	if ((infile = vim_tempname('i', TRUE)) == NULL)
@@ -11846,14 +11845,42 @@ get_cmd_output_as_rettv(
 	    EMSG2(_(e_notopen), infile);
 	    goto errret;
 	}
-	if (argvars[1].v_type == VAR_LIST)
+	if (argvars[1].v_type == VAR_NUMBER)
+	{
+	    linenr_T	lnum;
+	    buf_T	*buf;
+
+	    buf = buflist_findnr(argvars[1].vval.v_number);
+	    if (buf == NULL)
+	    {
+		EMSGN(_(e_nobufnr), argvars[1].vval.v_number);
+		goto errret;
+	    }
+
+	    for (lnum = 1; lnum <= buf->b_ml.ml_line_count; lnum++)
+	    {
+		for (p = ml_get_buf(buf, lnum, FALSE); *p != NUL; ++p)
+		    if (putc(*p == '\n' ? NUL : *p, fd) == EOF)
+		    {
+			err = TRUE;
+			break;
+		    }
+		if (putc(NL, fd) == EOF)
+		{
+		    err = TRUE;
+		    break;
+		}
+	    }
+	}
+	else if (argvars[1].v_type == VAR_LIST)
 	{
 	    if (write_list(fd, argvars[1].vval.v_list, TRUE) == FAIL)
 		err = TRUE;
 	}
 	else
 	{
-	    size_t len;
+	    size_t	len;
+	    char_u	buf[NUMBUFLEN];
 
 	    p = get_tv_string_buf_chk(&argvars[1], buf);
 	    if (p == NULL)
diff --git a/src/testdir/Make_all.mak b/src/testdir/Make_all.mak
index 072c61c796..63a1b051f0 100644
--- a/src/testdir/Make_all.mak
+++ b/src/testdir/Make_all.mak
@@ -184,6 +184,7 @@ NEW_TESTS = test_arglist.res \
 	    test_stat.res \
 	    test_substitute.res \
 	    test_syntax.res \
+	    test_system.res \
 	    test_textobjects.res \
 	    test_undo.res \
 	    test_usercommands.res \
diff --git a/src/testdir/test_system.vim b/src/testdir/test_system.vim
new file mode 100644
index 0000000000..5e8d68b141
--- /dev/null
+++ b/src/testdir/test_system.vim
@@ -0,0 +1,20 @@
+" Tests for system() and systemlist()
+
+function! Test_System()
+  if !executable('echo') || !executable('cat') || !executable('wc')
+    return
+  endif
+  call assert_equal("123\n", system('echo 123'))
+  call assert_equal(['123'], systemlist('echo 123'))
+  call assert_equal('123',   system('cat', '123'))
+  call assert_equal(['123'], systemlist('cat', '123'))
+  call assert_equal(["as\<NL>df"], systemlist('cat', ["as\<NL>df"]))
+  new Xdummy
+  call setline(1, ['asdf', "pw\<NL>er", 'xxxx'])
+  call assert_equal("3\n",  system('wc -l', bufnr('%')))
+  call assert_equal(['3'],  systemlist('wc -l', bufnr('%')))
+  call assert_equal(['asdf', "pw\<NL>er", 'xxxx'],  systemlist('cat', bufnr('%')))
+  bwipe!
+
+  call assert_fails('call system("wc -l", 99999)', 'E86:')
+endfunction
diff --git a/src/version.c b/src/version.c
index 0c16c28977..3be6cbbfc0 100644
--- a/src/version.c
+++ b/src/version.c
@@ -764,6 +764,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    151,
 /**/
     150,
 /**/

From 04e94c788175c83be8a78372b0ed6c332969edff Mon Sep 17 00:00:00 2001
From: Bram Moolenaar <Bram@vim.org>
Date: Sun, 8 Jan 2017 13:38:58 +0100
Subject: [PATCH 02/10] patch 8.0.0152: stray channellog created when running
 tests

Problem:    Running the channel test creates channellog.
Solution:   Delete the debug line.
---
 src/testdir/test_channel.vim | 1 -
 src/version.c                | 2 ++
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/testdir/test_channel.vim b/src/testdir/test_channel.vim
index 7baac1d677..81de17c34b 100644
--- a/src/testdir/test_channel.vim
+++ b/src/testdir/test_channel.vim
@@ -279,7 +279,6 @@ func Ch_channel_handler(port)
 endfunc
 
 func Test_channel_handler()
-call ch_logfile('channellog', 'w')
   call ch_log('Test_channel_handler()')
   let g:Ch_reply = ""
   let s:chopt.callback = 'Ch_handler'
diff --git a/src/version.c b/src/version.c
index 3be6cbbfc0..438a65d200 100644
--- a/src/version.c
+++ b/src/version.c
@@ -764,6 +764,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    152,
 /**/
     151,
 /**/

From 9d9c35651712b88c81f1ae11091de1fd0bbbd35c Mon Sep 17 00:00:00 2001
From: Bram Moolenaar <Bram@vim.org>
Date: Sun, 8 Jan 2017 13:55:06 +0100
Subject: [PATCH 03/10] patch 8.0.0153: system() test fails on MS-Windows

Problem:    system() test fails on MS-Windows.
Solution:   Deal when extra space and CR.
---
 src/testdir/test_system.vim | 28 ++++++++++++++++++++++++----
 src/version.c               |  2 ++
 2 files changed, 26 insertions(+), 4 deletions(-)

diff --git a/src/testdir/test_system.vim b/src/testdir/test_system.vim
index 5e8d68b141..be00d180c4 100644
--- a/src/testdir/test_system.vim
+++ b/src/testdir/test_system.vim
@@ -4,16 +4,36 @@ function! Test_System()
   if !executable('echo') || !executable('cat') || !executable('wc')
     return
   endif
-  call assert_equal("123\n", system('echo 123'))
-  call assert_equal(['123'], systemlist('echo 123'))
+  let out = system('echo 123')
+  " On Windows we may get a trailing space.
+  if out != "123 \n"
+    call assert_equal("123\n", out)
+  endif
+
+  let out = systemlist('echo 123')
+  " On Windows we may get a trailing space and CR.
+  if out != ["123 \r"]
+    call assert_equal(['123'], out)
+  endif
+
   call assert_equal('123',   system('cat', '123'))
   call assert_equal(['123'], systemlist('cat', '123'))
   call assert_equal(["as\<NL>df"], systemlist('cat', ["as\<NL>df"]))
   new Xdummy
   call setline(1, ['asdf', "pw\<NL>er", 'xxxx'])
   call assert_equal("3\n",  system('wc -l', bufnr('%')))
-  call assert_equal(['3'],  systemlist('wc -l', bufnr('%')))
-  call assert_equal(['asdf', "pw\<NL>er", 'xxxx'],  systemlist('cat', bufnr('%')))
+
+  let out = systemlist('wc -l', bufnr('%'))
+  " On Windows we may get a trailing CR.
+  if out != ["3\r"]
+    call assert_equal(['3'],  out)
+  endif
+
+  let out = systemlist('cat', bufnr('%'))
+  " On Windows we may get a trailing CR.
+  if out != ["asdf\r", "pw\<NL>er\r", "xxxx\r"]
+    call assert_equal(['asdf', "pw\<NL>er", 'xxxx'],  out)
+  endif
   bwipe!
 
   call assert_fails('call system("wc -l", 99999)', 'E86:')
diff --git a/src/version.c b/src/version.c
index 438a65d200..a1a74696af 100644
--- a/src/version.c
+++ b/src/version.c
@@ -764,6 +764,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    153,
 /**/
     152,
 /**/

From 31f19ce0a052f7c76d44a9a190e468c79cf5d56d Mon Sep 17 00:00:00 2001
From: Bram Moolenaar <Bram@vim.org>
Date: Sun, 8 Jan 2017 14:14:43 +0100
Subject: [PATCH 04/10] patch 8.0.0154: system() test fails on OS/X

Problem:    system() test fails on OS/X.
Solution:   Deal with leading spaces.
---
 src/testdir/test_system.vim | 10 +++++++++-
 src/version.c               |  2 ++
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/src/testdir/test_system.vim b/src/testdir/test_system.vim
index be00d180c4..0446bd9105 100644
--- a/src/testdir/test_system.vim
+++ b/src/testdir/test_system.vim
@@ -19,13 +19,21 @@ function! Test_System()
   call assert_equal('123',   system('cat', '123'))
   call assert_equal(['123'], systemlist('cat', '123'))
   call assert_equal(["as\<NL>df"], systemlist('cat', ["as\<NL>df"]))
+
   new Xdummy
   call setline(1, ['asdf', "pw\<NL>er", 'xxxx'])
-  call assert_equal("3\n",  system('wc -l', bufnr('%')))
+  let out = system('wc -l', bufnr('%'))
+  " On OS/X we get leading spaces
+  let out = substitute(out, '^ *', '', '')
+  call assert_equal("3\n", out)
 
   let out = systemlist('wc -l', bufnr('%'))
   " On Windows we may get a trailing CR.
   if out != ["3\r"]
+    " On OS/X we get leading spaces
+    if type(out) == v:t_list
+      let out[0] = substitute(out[0], '^ *', '', '')
+    endif
     call assert_equal(['3'],  out)
   endif
 
diff --git a/src/version.c b/src/version.c
index a1a74696af..368e6bea32 100644
--- a/src/version.c
+++ b/src/version.c
@@ -764,6 +764,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    154,
 /**/
     153,
 /**/

From a216255a4faa91a15e7005ac319f2f62294f3f9e Mon Sep 17 00:00:00 2001
From: Bram Moolenaar <Bram@vim.org>
Date: Sun, 8 Jan 2017 17:46:20 +0100
Subject: [PATCH 05/10] patch 8.0.0155: ubsan complains about NULL pointer

Problem:    When sorting zero elements a NULL pointer is passed to qsort(),
            which ubsan warns for.
Solution:   Don't call qsort() if there are no elements. (Dominique Pelle)
---
 src/syntax.c  | 6 ++++--
 src/version.c | 2 ++
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/syntax.c b/src/syntax.c
index b2108e4d93..80546bb02d 100644
--- a/src/syntax.c
+++ b/src/syntax.c
@@ -6704,8 +6704,10 @@ syntime_report(void)
 	}
     }
 
-    /* sort on total time */
-    qsort(ga.ga_data, (size_t)ga.ga_len, sizeof(time_entry_T),
+    /* Sort on total time. Skip if there are no items to avoid passing NULL
+     * pointer to qsort(). */
+    if (ga.ga_len > 1)
+	qsort(ga.ga_data, (size_t)ga.ga_len, sizeof(time_entry_T),
 							 syn_compare_syntime);
 
     MSG_PUTS_TITLE(_("  TOTAL      COUNT  MATCH   SLOWEST     AVERAGE   NAME               PATTERN"));
diff --git a/src/version.c b/src/version.c
index 368e6bea32..d88c03be7d 100644
--- a/src/version.c
+++ b/src/version.c
@@ -764,6 +764,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    155,
 /**/
     154,
 /**/

From 453b576ee5d32e9b8e6876712748ae01f9be68dd Mon Sep 17 00:00:00 2001
From: Bram Moolenaar <Bram@vim.org>
Date: Sun, 8 Jan 2017 17:59:14 +0100
Subject: [PATCH 06/10] patch 8.0.0156: not enough test coverage for float
 functions

Problem:    Several float functions are not covered by tests.
Solution:   Add float tests. (Dominique Pelle)
---
 src/Makefile                    |   1 +
 src/testdir/test_alot.vim       |   1 +
 src/testdir/test_float_func.vim | 227 ++++++++++++++++++++++++++++++++
 src/version.c                   |   2 +
 4 files changed, 231 insertions(+)
 create mode 100644 src/testdir/test_float_func.vim

diff --git a/src/Makefile b/src/Makefile
index 3f61de6526..7ae3fcbb23 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -2104,6 +2104,7 @@ test_arglist \
 	test_fileformat \
 	test_filter_cmd \
 	test_filter_map \
+	test_float_func \
 	test_fnameescape \
 	test_fnamemodify \
 	test_fold \
diff --git a/src/testdir/test_alot.vim b/src/testdir/test_alot.vim
index d24b97fb92..6e989f6203 100644
--- a/src/testdir/test_alot.vim
+++ b/src/testdir/test_alot.vim
@@ -16,6 +16,7 @@ source test_file_perm.vim
 source test_fileformat.vim
 source test_filter_cmd.vim
 source test_filter_map.vim
+source test_float_func.vim
 source test_fnamemodify.vim
 source test_glob2regpat.vim
 source test_goto.vim
diff --git a/src/testdir/test_float_func.vim b/src/testdir/test_float_func.vim
new file mode 100644
index 0000000000..25633d9731
--- /dev/null
+++ b/src/testdir/test_float_func.vim
@@ -0,0 +1,227 @@
+" test float functions
+
+if !has('float')
+  finish
+end
+
+func Test_abs()
+  call assert_equal(string(abs(1.23)), '1.23')
+  call assert_equal(string(abs(-1.23)), '1.23')
+  call assert_equal(string(abs(0.0)), '0.0')
+  call assert_equal(string(abs(1.0/(1.0/0.0))), '0.0')
+  call assert_equal(string(abs(-1.0/(1.0/0.0))), '0.0')
+  call assert_equal(string(abs(1.0/0.0)), 'inf')
+  call assert_equal(string(abs(-1.0/0.0)), 'inf')
+  call assert_equal(string(abs(0.0/0.0)), 'nan')
+endfunc
+
+func Test_sqrt()
+  call assert_equal(string(sqrt(0.0)), '0.0')
+  call assert_equal(string(sqrt(2.0)), '1.414214')
+  call assert_equal(string(sqrt(1.0/0.0)), 'inf')
+  call assert_equal(string(sqrt(-1.0)), 'nan')
+  call assert_equal(string(sqrt(0.0/0.0)), 'nan')
+endfunc
+
+func Test_log()
+  call assert_equal(string(log(1.0)), '0.0')
+  call assert_equal(string(log(0.5)), '-0.693147')
+  call assert_equal(string(log(0.0)), '-inf')
+  call assert_equal(string(log(-1.0)), 'nan')
+  call assert_equal(string(log(1.0/0.0)), 'inf')
+  call assert_equal(string(log(0.0/0.0)), 'nan')
+endfunc
+
+func Test_log10()
+  call assert_equal(string(log10(1.0)), '0.0')
+  call assert_equal(string(log10(100.0)), '2.0')
+  call assert_equal(string(log10(120.0)), '2.079181')
+  call assert_equal(string(log10(0.0)), '-inf')
+  call assert_equal(string(log10(-1.0)), 'nan')
+  call assert_equal(string(log10(1.0/0.0)), 'inf')
+  call assert_equal(string(log10(0.0/0.0)), 'nan')
+endfunc
+
+func Test_exp()
+  call assert_equal(string(exp(0.0)), '1.0')
+  call assert_equal(string(exp(2.0)), '7.389056')
+  call assert_equal(string(exp(-1.0)),'0.367879')
+  call assert_equal(string(exp(1.0/0.0)), 'inf')
+  call assert_equal(string(exp(-1.0/0.0)), '0.0')
+  call assert_equal(string(exp(0.0/0.0)), 'nan')
+endfunc
+
+func Test_sin()
+  call assert_equal(string(sin(0.0)), '0.0')
+  call assert_equal(string(sin(1.0)), '0.841471')
+  call assert_equal(string(sin(-0.5)), '-0.479426')
+  call assert_equal(string(sin(0.0/0.0)), 'nan')
+  call assert_equal(string(sin(1.0/0.0)), 'nan')
+  call assert_equal(string(sin(1.0/(1.0/0.0))), '0.0')
+  call assert_equal(string(sin(-1.0/(1.0/0.0))), '-0.0')
+endfunc
+
+func Test_asin()
+  call assert_equal(string(asin(0.0)), '0.0')
+  call assert_equal(string(asin(1.0)), '1.570796')
+  call assert_equal(string(asin(-0.5)), '-0.523599')
+  call assert_equal(string(asin(1.1)), 'nan')
+  call assert_equal(string(asin(1.0/0.0)), 'nan')
+  call assert_equal(string(asin(0.0/0.0)), 'nan')
+endfunc
+
+func Test_sinh()
+  call assert_equal(string(sinh(0.0)), '0.0')
+  call assert_equal(string(sinh(0.5)), '0.521095')
+  call assert_equal(string(sinh(-0.9)), '-1.026517')
+  call assert_equal(string(sinh(1.0/0.0)), 'inf')
+  call assert_equal(string(sinh(-1.0/0.0)), '-inf')
+  call assert_equal(string(sinh(0.0/0.0)), 'nan')
+endfunc
+
+func Test_cos()
+  call assert_equal(string(cos(0.0)), '1.0')
+  call assert_equal(string(cos(1.0)), '0.540302')
+  call assert_equal(string(cos(-0.5)), '0.877583')
+  call assert_equal(string(cos(0.0/0.0)), 'nan')
+  call assert_equal(string(cos(1.0/0.0)), 'nan')
+endfunc
+
+func Test_acos()
+  call assert_equal(string(acos(0.0)), '1.570796')
+  call assert_equal(string(acos(1.0)), '0.0')
+  call assert_equal(string(acos(-1.0)), '3.141593')
+  call assert_equal(string(acos(-0.5)), '2.094395')
+  call assert_equal(string(acos(1.1)), 'nan')
+  call assert_equal(string(acos(1.0/0.0)), 'nan')
+  call assert_equal(string(acos(0.0/0.0)), 'nan')
+endfunc
+
+func Test_cosh()
+  call assert_equal(string(cosh(0.0)), '1.0')
+  call assert_equal(string(cosh(0.5)), '1.127626')
+  call assert_equal(string(cosh(1.0/0.0)), 'inf')
+  call assert_equal(string(cosh(-1.0/0.0)), 'inf')
+  call assert_equal(string(cosh(0.0/0.0)), 'nan')
+endfunc
+
+func Test_tan()
+  call assert_equal(string(tan(0.0)), '0.0')
+  call assert_equal(string(tan(0.5)), '0.546302')
+  call assert_equal(string(tan(-0.5)), '-0.546302')
+  call assert_equal(string(tan(1.0/0.0)), 'nan')
+  call assert_equal(string(cos(0.0/0.0)), 'nan')
+  call assert_equal(string(tan(1.0/(1.0/0.0))), '0.0')
+  call assert_equal(string(tan(-1.0/(1.0/0.0))), '-0.0')
+endfunc
+
+func Test_atan()
+  call assert_equal(string(atan(0.0)), '0.0')
+  call assert_equal(string(atan(0.5)), '0.463648')
+  call assert_equal(string(atan(-1.0)), '-0.785398')
+  call assert_equal(string(atan(1.0/0.0)), '1.570796')
+  call assert_equal(string(atan(-1.0/0.0)), '-1.570796')
+  call assert_equal(string(atan(0.0/0.0)), 'nan')
+endfunc
+
+func Test_atan2()
+  call assert_equal(string(atan2(-1, -1)), '-2.356194')
+  call assert_equal(string(atan2(1, -1)), '2.356194')
+  call assert_equal(string(atan2(1.0, 1.0/0.0)), '0.0')
+  call assert_equal(string(atan2(1.0/0.0, 1.0)), '1.570796')
+  call assert_equal(string(atan2(0.0/0.0, 1.0)), 'nan')
+endfunc
+
+func Test_tanh()
+  call assert_equal(string(tanh(0.0)), '0.0')
+  call assert_equal(string(tanh(0.5)), '0.462117')
+  call assert_equal(string(tanh(-1.0)), '-0.761594')
+  call assert_equal(string(tanh(1.0/0.0)), '1.0')
+  call assert_equal(string(tanh(-1.0/0.0)), '-1.0')
+  call assert_equal(string(tanh(0.0/0.0)), 'nan')
+endfunc
+
+func Test_fmod()
+  call assert_equal(string(fmod(12.33, 1.22)), '0.13')
+  call assert_equal(string(fmod(-12.33, 1.22)), '-0.13')
+  call assert_equal(string(fmod(1.0/0.0, 1.0)), 'nan')
+  call assert_equal(string(fmod(1.0, 1.0/0.0)), '1.0')
+  call assert_equal(string(fmod(1.0, 0.0)), 'nan')
+endfunc
+
+func Test_pow()
+  call assert_equal(string(pow(0.0, 0.0)), '1.0')
+  call assert_equal(string(pow(2.0, 3.0)), '8.0')
+  call assert_equal(string(pow(2.0, 0.0/0.0)), 'nan')
+  call assert_equal(string(pow(0.0/0.0, 3.0)), 'nan')
+  call assert_equal(string(pow(0.0/0.0, 3.0)), 'nan')
+  call assert_equal(string(pow(2.0, 1.0/0.0)), 'inf')
+  call assert_equal(string(pow(1.0/0.0, 3.0)), 'inf')
+endfunc
+
+func Test_str2float()
+  call assert_equal(string(str2float('1')), '1.0')
+  call assert_equal(string(str2float('1.23')), '1.23')
+  call assert_equal(string(str2float('1.23abc')), '1.23')
+  call assert_equal(string(str2float('1e40')), '1.0e40')
+  call assert_equal(string(str2float('1e1000')), 'inf')
+  call assert_equal(string(str2float('inf')), 'inf')
+  call assert_equal(string(str2float('-inf')), '-inf')
+  call assert_equal(string(str2float('Inf')), 'inf')
+  call assert_equal(string(str2float('nan')), 'nan')
+  call assert_equal(string(str2float('NaN')), 'nan')
+endfunc
+
+func Test_floor()
+  call assert_equal(string(floor(2.0)), '2.0')
+  call assert_equal(string(floor(2.11)), '2.0')
+  call assert_equal(string(floor(2.99)), '2.0')
+  call assert_equal(string(floor(-2.11)), '-3.0')
+  call assert_equal(string(floor(-2.99)), '-3.0')
+  call assert_equal(string(floor(0.0/0.0)), 'nan')
+  call assert_equal(string(floor(1.0/0.0)), 'inf')
+  call assert_equal(string(floor(-1.0/0.0)), '-inf')
+endfunc
+
+func Test_ceil()
+  call assert_equal(string(ceil(2.0)), '2.0')
+  call assert_equal(string(ceil(2.11)), '3.0')
+  call assert_equal(string(ceil(2.99)), '3.0')
+  call assert_equal(string(ceil(-2.11)), '-2.0')
+  call assert_equal(string(ceil(-2.99)), '-2.0')
+  call assert_equal(string(ceil(0.0/0.0)), 'nan')
+  call assert_equal(string(ceil(1.0/0.0)), 'inf')
+  call assert_equal(string(ceil(-1.0/0.0)), '-inf')
+endfunc
+
+func Test_round()
+  call assert_equal(string(round(2.1)), '2.0')
+  call assert_equal(string(round(2.5)), '3.0')
+  call assert_equal(string(round(2.9)), '3.0')
+  call assert_equal(string(round(-2.1)), '-2.0')
+  call assert_equal(string(round(-2.5)), '-3.0')
+  call assert_equal(string(round(-2.9)), '-3.0')
+  call assert_equal(string(round(0.0/0.0)), 'nan')
+  call assert_equal(string(round(1.0/0.0)), 'inf')
+  call assert_equal(string(round(-1.0/0.0)), '-inf')
+endfunc
+
+func Test_trunc()
+  call assert_equal(string(trunc(2.1)), '2.0')
+  call assert_equal(string(trunc(2.5)), '2.0')
+  call assert_equal(string(trunc(2.9)), '2.0')
+  call assert_equal(string(trunc(-2.1)), '-2.0')
+  call assert_equal(string(trunc(-2.5)), '-2.0')
+  call assert_equal(string(trunc(-2.9)), '-2.0')
+  call assert_equal(string(trunc(0.0/0.0)), 'nan')
+  call assert_equal(string(trunc(1.0/0.0)), 'inf')
+  call assert_equal(string(trunc(-1.0/0.0)), '-inf')
+endfunc
+
+func Test_isnan()
+  call assert_equal(isnan(1.0), 0)
+  call assert_equal(isnan(0.0/0.0), 1)
+  call assert_equal(isnan(1.0/0.0), 0)
+  call assert_equal(isnan('a'), 0)
+  call assert_equal(isnan([]), 0)
+endfunc
diff --git a/src/version.c b/src/version.c
index d88c03be7d..350b4ad048 100644
--- a/src/version.c
+++ b/src/version.c
@@ -764,6 +764,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    156,
 /**/
     155,
 /**/

From 2d02839050a2557bf36dab37ccd9f92168a757d1 Mon Sep 17 00:00:00 2001
From: Bram Moolenaar <Bram@vim.org>
Date: Sun, 8 Jan 2017 18:28:22 +0100
Subject: [PATCH 07/10] patch 8.0.0157: no completion for :syntax spell and
 :syntax sync

Problem:    No command line completion for ":syntax spell" and ":syntax sync".
Solution:   Implement the completion. (Dominique Pelle)
---
 src/syntax.c                | 38 +++++++++++++++++++++++++++++++------
 src/testdir/test_syntax.vim |  6 ++++++
 src/version.c               |  2 ++
 3 files changed, 40 insertions(+), 6 deletions(-)

diff --git a/src/syntax.c b/src/syntax.c
index 80546bb02d..bc5c9b74ff 100644
--- a/src/syntax.c
+++ b/src/syntax.c
@@ -6383,7 +6383,9 @@ syntax_present(win_T *win)
 static enum
 {
     EXP_SUBCMD,	    /* expand ":syn" sub-commands */
-    EXP_CASE	    /* expand ":syn case" arguments */
+    EXP_CASE,	    /* expand ":syn case" arguments */
+    EXP_SPELL,	    /* expand ":syn spell" arguments */
+    EXP_SYNC	    /* expand ":syn sync" arguments */
 } expand_what;
 
 /*
@@ -6434,6 +6436,10 @@ set_context_in_syntax_cmd(expand_T *xp, char_u *arg)
 		xp->xp_context = EXPAND_NOTHING;
 	    else if (STRNICMP(arg, "case", p - arg) == 0)
 		expand_what = EXP_CASE;
+	    else if (STRNICMP(arg, "spell", p - arg) == 0)
+		expand_what = EXP_SPELL;
+	    else if (STRNICMP(arg, "sync", p - arg) == 0)
+		expand_what = EXP_SYNC;
 	    else if (  STRNICMP(arg, "keyword", p - arg) == 0
 		    || STRNICMP(arg, "region", p - arg) == 0
 		    || STRNICMP(arg, "match", p - arg) == 0
@@ -6445,8 +6451,6 @@ set_context_in_syntax_cmd(expand_T *xp, char_u *arg)
     }
 }
 
-static char *(case_args[]) = {"match", "ignore", NULL};
-
 /*
  * Function given to ExpandGeneric() to obtain the list syntax names for
  * expansion.
@@ -6454,9 +6458,31 @@ static char *(case_args[]) = {"match", "ignore", NULL};
     char_u *
 get_syntax_name(expand_T *xp UNUSED, int idx)
 {
-    if (expand_what == EXP_SUBCMD)
-	return (char_u *)subcommands[idx].name;
-    return (char_u *)case_args[idx];
+    switch (expand_what)
+    {
+	case EXP_SUBCMD:
+	    return (char_u *)subcommands[idx].name;
+	case EXP_CASE:
+	{
+	    static char *case_args[] = {"match", "ignore", NULL};
+	    return (char_u *)case_args[idx];
+	}
+	case EXP_SPELL:
+	{
+	    static char *spell_args[] =
+		{"toplevel", "notoplevel", "default", NULL};
+	    return (char_u *)spell_args[idx];
+	}
+	case EXP_SYNC:
+	{
+	    static char *sync_args[] =
+		{"ccomment", "clear", "fromstart",
+		 "linebreaks=", "linecont", "lines=", "match",
+		 "maxlines=", "minlines=", "region", NULL};
+	    return (char_u *)sync_args[idx];
+	}
+    }
+    return NULL;
 }
 
 #endif /* FEAT_CMDL_COMPL */
diff --git a/src/testdir/test_syntax.vim b/src/testdir/test_syntax.vim
index 7cb67e6771..23ef1549e7 100644
--- a/src/testdir/test_syntax.vim
+++ b/src/testdir/test_syntax.vim
@@ -150,6 +150,12 @@ func Test_syntax_completion()
   call feedkeys(":syn case \<C-A>\<C-B>\"\<CR>", 'tx')
   call assert_equal('"syn case ignore match', @:)
 
+  call feedkeys(":syn spell \<C-A>\<C-B>\"\<CR>", 'tx')
+  call assert_equal('"syn spell default notoplevel toplevel', @:)
+
+  call feedkeys(":syn sync \<C-A>\<C-B>\"\<CR>", 'tx')
+  call assert_equal('"syn sync ccomment clear fromstart linebreaks= linecont lines= match maxlines= minlines= region', @:)
+
   call feedkeys(":syn list \<C-A>\<C-B>\"\<CR>", 'tx')
   call assert_match('^"syn list Boolean Character ', @:)
 
diff --git a/src/version.c b/src/version.c
index 350b4ad048..824a29275f 100644
--- a/src/version.c
+++ b/src/version.c
@@ -764,6 +764,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    157,
 /**/
     156,
 /**/

From 6247361101dcccc0c877e90ad67cd0cc83df7c68 Mon Sep 17 00:00:00 2001
From: Bram Moolenaar <Bram@vim.org>
Date: Sun, 8 Jan 2017 19:25:40 +0100
Subject: [PATCH 08/10] patch 8.0.0158: float funcion test fails on MS-Windows

Problem:    On MS-Windows some float functions return a different value when
            passed unusual values.  strtod() doesn't work for "inf" and "nan".
Solution:   Accept both results.  Fix str2float() for MS-Windows.  Also
            reorder assert function arguments.
---
 src/eval.c                      |  16 ++
 src/testdir/test_float_func.vim | 310 ++++++++++++++++----------------
 src/version.c                   |   2 +
 3 files changed, 175 insertions(+), 153 deletions(-)

diff --git a/src/eval.c b/src/eval.c
index 9d2c5ac72b..70fbc8863b 100644
--- a/src/eval.c
+++ b/src/eval.c
@@ -5971,6 +5971,22 @@ string2float(
     char	*s = (char *)text;
     float_T	f;
 
+    /* MS-Windows does not deal with "inf" and "nan" properly. */
+    if (STRNICMP(text, "inf", 3) == 0)
+    {
+	*value = INFINITY;
+	return 3;
+    }
+    if (STRNICMP(text, "-inf", 3) == 0)
+    {
+	*value = -INFINITY;
+	return 4;
+    }
+    if (STRNICMP(text, "nan", 3) == 0)
+    {
+	*value = NAN;
+	return 3;
+    }
     f = strtod(s, &s);
     *value = f;
     return (int)((char_u *)s - text);
diff --git a/src/testdir/test_float_func.vim b/src/testdir/test_float_func.vim
index 25633d9731..e51b83eff2 100644
--- a/src/testdir/test_float_func.vim
+++ b/src/testdir/test_float_func.vim
@@ -5,223 +5,227 @@ if !has('float')
 end
 
 func Test_abs()
-  call assert_equal(string(abs(1.23)), '1.23')
-  call assert_equal(string(abs(-1.23)), '1.23')
-  call assert_equal(string(abs(0.0)), '0.0')
-  call assert_equal(string(abs(1.0/(1.0/0.0))), '0.0')
-  call assert_equal(string(abs(-1.0/(1.0/0.0))), '0.0')
-  call assert_equal(string(abs(1.0/0.0)), 'inf')
-  call assert_equal(string(abs(-1.0/0.0)), 'inf')
-  call assert_equal(string(abs(0.0/0.0)), 'nan')
+  call assert_equal('1.23', string(abs(1.23)))
+  call assert_equal('1.23', string(abs(-1.23)))
+  call assert_equal('0.0', string(abs(0.0)))
+  call assert_equal('0.0', string(abs(1.0/(1.0/0.0))))
+  call assert_equal('0.0', string(abs(-1.0/(1.0/0.0))))
+  call assert_equal('inf', string(abs(1.0/0.0)))
+  call assert_equal('inf', string(abs(-1.0/0.0)))
+  call assert_equal('nan', string(abs(0.0/0.0)))
 endfunc
 
 func Test_sqrt()
-  call assert_equal(string(sqrt(0.0)), '0.0')
-  call assert_equal(string(sqrt(2.0)), '1.414214')
-  call assert_equal(string(sqrt(1.0/0.0)), 'inf')
-  call assert_equal(string(sqrt(-1.0)), 'nan')
-  call assert_equal(string(sqrt(0.0/0.0)), 'nan')
+  call assert_equal('0.0', string(sqrt(0.0)))
+  call assert_equal('1.414214', string(sqrt(2.0)))
+  call assert_equal('inf', string(sqrt(1.0/0.0)))
+  call assert_equal('nan', string(sqrt(-1.0)))
+  call assert_equal('nan', string(sqrt(0.0/0.0)))
 endfunc
 
 func Test_log()
-  call assert_equal(string(log(1.0)), '0.0')
-  call assert_equal(string(log(0.5)), '-0.693147')
-  call assert_equal(string(log(0.0)), '-inf')
-  call assert_equal(string(log(-1.0)), 'nan')
-  call assert_equal(string(log(1.0/0.0)), 'inf')
-  call assert_equal(string(log(0.0/0.0)), 'nan')
+  call assert_equal('0.0', string(log(1.0)))
+  call assert_equal('-0.693147', string(log(0.5)))
+  call assert_equal('-inf', string(log(0.0)))
+  call assert_equal('nan', string(log(-1.0)))
+  call assert_equal('inf', string(log(1.0/0.0)))
+  call assert_equal('nan', string(log(0.0/0.0)))
 endfunc
 
 func Test_log10()
-  call assert_equal(string(log10(1.0)), '0.0')
-  call assert_equal(string(log10(100.0)), '2.0')
-  call assert_equal(string(log10(120.0)), '2.079181')
-  call assert_equal(string(log10(0.0)), '-inf')
-  call assert_equal(string(log10(-1.0)), 'nan')
-  call assert_equal(string(log10(1.0/0.0)), 'inf')
-  call assert_equal(string(log10(0.0/0.0)), 'nan')
+  call assert_equal('0.0', string(log10(1.0)))
+  call assert_equal('2.0', string(log10(100.0)))
+  call assert_equal('2.079181', string(log10(120.0)))
+  call assert_equal('-inf', string(log10(0.0)))
+  call assert_equal('nan', string(log10(-1.0)))
+  call assert_equal('inf', string(log10(1.0/0.0)))
+  call assert_equal('nan', string(log10(0.0/0.0)))
 endfunc
 
 func Test_exp()
-  call assert_equal(string(exp(0.0)), '1.0')
-  call assert_equal(string(exp(2.0)), '7.389056')
-  call assert_equal(string(exp(-1.0)),'0.367879')
-  call assert_equal(string(exp(1.0/0.0)), 'inf')
-  call assert_equal(string(exp(-1.0/0.0)), '0.0')
-  call assert_equal(string(exp(0.0/0.0)), 'nan')
+  call assert_equal('1.0', string(exp(0.0)))
+  call assert_equal('7.389056', string(exp(2.0)))
+  call assert_equal('0.367879', string(exp(-1.0)))
+  call assert_equal('inf', string(exp(1.0/0.0)))
+  call assert_equal('0.0', string(exp(-1.0/0.0)))
+  call assert_equal('nan', string(exp(0.0/0.0)))
 endfunc
 
 func Test_sin()
-  call assert_equal(string(sin(0.0)), '0.0')
-  call assert_equal(string(sin(1.0)), '0.841471')
-  call assert_equal(string(sin(-0.5)), '-0.479426')
-  call assert_equal(string(sin(0.0/0.0)), 'nan')
-  call assert_equal(string(sin(1.0/0.0)), 'nan')
-  call assert_equal(string(sin(1.0/(1.0/0.0))), '0.0')
-  call assert_equal(string(sin(-1.0/(1.0/0.0))), '-0.0')
+  call assert_equal('0.0', string(sin(0.0)))
+  call assert_equal('0.841471', string(sin(1.0)))
+  call assert_equal('-0.479426', string(sin(-0.5)))
+  call assert_equal('nan', string(sin(0.0/0.0)))
+  call assert_equal('nan', string(sin(1.0/0.0)))
+  call assert_equal('0.0', string(sin(1.0/(1.0/0.0))))
+  call assert_equal('-0.0', string(sin(-1.0/(1.0/0.0))))
 endfunc
 
 func Test_asin()
-  call assert_equal(string(asin(0.0)), '0.0')
-  call assert_equal(string(asin(1.0)), '1.570796')
-  call assert_equal(string(asin(-0.5)), '-0.523599')
-  call assert_equal(string(asin(1.1)), 'nan')
-  call assert_equal(string(asin(1.0/0.0)), 'nan')
-  call assert_equal(string(asin(0.0/0.0)), 'nan')
+  call assert_equal('0.0', string(asin(0.0)))
+  call assert_equal('1.570796', string(asin(1.0)))
+  call assert_equal('-0.523599', string(asin(-0.5)))
+  call assert_equal('nan', string(asin(1.1)))
+  call assert_equal('nan', string(asin(1.0/0.0)))
+  call assert_equal('nan', string(asin(0.0/0.0)))
 endfunc
 
 func Test_sinh()
-  call assert_equal(string(sinh(0.0)), '0.0')
-  call assert_equal(string(sinh(0.5)), '0.521095')
-  call assert_equal(string(sinh(-0.9)), '-1.026517')
-  call assert_equal(string(sinh(1.0/0.0)), 'inf')
-  call assert_equal(string(sinh(-1.0/0.0)), '-inf')
-  call assert_equal(string(sinh(0.0/0.0)), 'nan')
+  call assert_equal('0.0', string(sinh(0.0)))
+  call assert_equal('0.521095', string(sinh(0.5)))
+  call assert_equal('-1.026517', string(sinh(-0.9)))
+  call assert_equal('inf', string(sinh(1.0/0.0)))
+  call assert_equal('-inf', string(sinh(-1.0/0.0)))
+  call assert_equal('nan', string(sinh(0.0/0.0)))
 endfunc
 
 func Test_cos()
-  call assert_equal(string(cos(0.0)), '1.0')
-  call assert_equal(string(cos(1.0)), '0.540302')
-  call assert_equal(string(cos(-0.5)), '0.877583')
-  call assert_equal(string(cos(0.0/0.0)), 'nan')
-  call assert_equal(string(cos(1.0/0.0)), 'nan')
+  call assert_equal('1.0', string(cos(0.0)))
+  call assert_equal('0.540302', string(cos(1.0)))
+  call assert_equal('0.877583', string(cos(-0.5)))
+  call assert_equal('nan', string(cos(0.0/0.0)))
+  call assert_equal('nan', string(cos(1.0/0.0)))
 endfunc
 
 func Test_acos()
-  call assert_equal(string(acos(0.0)), '1.570796')
-  call assert_equal(string(acos(1.0)), '0.0')
-  call assert_equal(string(acos(-1.0)), '3.141593')
-  call assert_equal(string(acos(-0.5)), '2.094395')
-  call assert_equal(string(acos(1.1)), 'nan')
-  call assert_equal(string(acos(1.0/0.0)), 'nan')
-  call assert_equal(string(acos(0.0/0.0)), 'nan')
+  call assert_equal('1.570796', string(acos(0.0)))
+  call assert_equal('0.0', string(acos(1.0)))
+  call assert_equal('3.141593', string(acos(-1.0)))
+  call assert_equal('2.094395', string(acos(-0.5)))
+  call assert_equal('nan', string(acos(1.1)))
+  call assert_equal('nan', string(acos(1.0/0.0)))
+  call assert_equal('nan', string(acos(0.0/0.0)))
 endfunc
 
 func Test_cosh()
-  call assert_equal(string(cosh(0.0)), '1.0')
-  call assert_equal(string(cosh(0.5)), '1.127626')
-  call assert_equal(string(cosh(1.0/0.0)), 'inf')
-  call assert_equal(string(cosh(-1.0/0.0)), 'inf')
-  call assert_equal(string(cosh(0.0/0.0)), 'nan')
+  call assert_equal('1.0', string(cosh(0.0)))
+  call assert_equal('1.127626', string(cosh(0.5)))
+  call assert_equal('inf', string(cosh(1.0/0.0)))
+  call assert_equal('inf', string(cosh(-1.0/0.0)))
+  call assert_equal('nan', string(cosh(0.0/0.0)))
 endfunc
 
 func Test_tan()
-  call assert_equal(string(tan(0.0)), '0.0')
-  call assert_equal(string(tan(0.5)), '0.546302')
-  call assert_equal(string(tan(-0.5)), '-0.546302')
-  call assert_equal(string(tan(1.0/0.0)), 'nan')
-  call assert_equal(string(cos(0.0/0.0)), 'nan')
-  call assert_equal(string(tan(1.0/(1.0/0.0))), '0.0')
-  call assert_equal(string(tan(-1.0/(1.0/0.0))), '-0.0')
+  call assert_equal('0.0', string(tan(0.0)))
+  call assert_equal('0.546302', string(tan(0.5)))
+  call assert_equal('-0.546302', string(tan(-0.5)))
+  call assert_equal('nan', string(tan(1.0/0.0)))
+  call assert_equal('nan', string(cos(0.0/0.0)))
+  call assert_equal('0.0', string(tan(1.0/(1.0/0.0))))
+  call assert_equal('-0.0', string(tan(-1.0/(1.0/0.0))))
 endfunc
 
 func Test_atan()
-  call assert_equal(string(atan(0.0)), '0.0')
-  call assert_equal(string(atan(0.5)), '0.463648')
-  call assert_equal(string(atan(-1.0)), '-0.785398')
-  call assert_equal(string(atan(1.0/0.0)), '1.570796')
-  call assert_equal(string(atan(-1.0/0.0)), '-1.570796')
-  call assert_equal(string(atan(0.0/0.0)), 'nan')
+  call assert_equal('0.0', string(atan(0.0)))
+  call assert_equal('0.463648', string(atan(0.5)))
+  call assert_equal('-0.785398', string(atan(-1.0)))
+  call assert_equal('1.570796', string(atan(1.0/0.0)))
+  call assert_equal('-1.570796', string(atan(-1.0/0.0)))
+  call assert_equal('nan', string(atan(0.0/0.0)))
 endfunc
 
 func Test_atan2()
-  call assert_equal(string(atan2(-1, -1)), '-2.356194')
-  call assert_equal(string(atan2(1, -1)), '2.356194')
-  call assert_equal(string(atan2(1.0, 1.0/0.0)), '0.0')
-  call assert_equal(string(atan2(1.0/0.0, 1.0)), '1.570796')
-  call assert_equal(string(atan2(0.0/0.0, 1.0)), 'nan')
+  call assert_equal('-2.356194', string(atan2(-1, -1)))
+  call assert_equal('2.356194', string(atan2(1, -1)))
+  call assert_equal('0.0', string(atan2(1.0, 1.0/0.0)))
+  call assert_equal('1.570796', string(atan2(1.0/0.0, 1.0)))
+  call assert_equal('nan', string(atan2(0.0/0.0, 1.0)))
 endfunc
 
 func Test_tanh()
-  call assert_equal(string(tanh(0.0)), '0.0')
-  call assert_equal(string(tanh(0.5)), '0.462117')
-  call assert_equal(string(tanh(-1.0)), '-0.761594')
-  call assert_equal(string(tanh(1.0/0.0)), '1.0')
-  call assert_equal(string(tanh(-1.0/0.0)), '-1.0')
-  call assert_equal(string(tanh(0.0/0.0)), 'nan')
+  call assert_equal('0.0', string(tanh(0.0)))
+  call assert_equal('0.462117', string(tanh(0.5)))
+  call assert_equal('-0.761594', string(tanh(-1.0)))
+  call assert_equal('1.0', string(tanh(1.0/0.0)))
+  call assert_equal('-1.0', string(tanh(-1.0/0.0)))
+  call assert_equal('nan', string(tanh(0.0/0.0)))
 endfunc
 
 func Test_fmod()
-  call assert_equal(string(fmod(12.33, 1.22)), '0.13')
-  call assert_equal(string(fmod(-12.33, 1.22)), '-0.13')
-  call assert_equal(string(fmod(1.0/0.0, 1.0)), 'nan')
-  call assert_equal(string(fmod(1.0, 1.0/0.0)), '1.0')
-  call assert_equal(string(fmod(1.0, 0.0)), 'nan')
+  call assert_equal('0.13', string(fmod(12.33, 1.22)))
+  call assert_equal('-0.13', string(fmod(-12.33, 1.22)))
+  call assert_equal('nan', string(fmod(1.0/0.0, 1.0)))
+  " On Windows we get "nan" instead of 1.0, accept both.
+  let res = string(fmod(1.0, 1.0/0.0))
+  if res != 'nan'
+    call assert_equal('1.0', res)
+  endif
+  call assert_equal('nan', string(fmod(1.0, 0.0)))
 endfunc
 
 func Test_pow()
-  call assert_equal(string(pow(0.0, 0.0)), '1.0')
-  call assert_equal(string(pow(2.0, 3.0)), '8.0')
-  call assert_equal(string(pow(2.0, 0.0/0.0)), 'nan')
-  call assert_equal(string(pow(0.0/0.0, 3.0)), 'nan')
-  call assert_equal(string(pow(0.0/0.0, 3.0)), 'nan')
-  call assert_equal(string(pow(2.0, 1.0/0.0)), 'inf')
-  call assert_equal(string(pow(1.0/0.0, 3.0)), 'inf')
+  call assert_equal('1.0', string(pow(0.0, 0.0)))
+  call assert_equal('8.0', string(pow(2.0, 3.0)))
+  call assert_equal('nan', string(pow(2.0, 0.0/0.0)))
+  call assert_equal('nan', string(pow(0.0/0.0, 3.0)))
+  call assert_equal('nan', string(pow(0.0/0.0, 3.0)))
+  call assert_equal('inf', string(pow(2.0, 1.0/0.0)))
+  call assert_equal('inf', string(pow(1.0/0.0, 3.0)))
 endfunc
 
 func Test_str2float()
-  call assert_equal(string(str2float('1')), '1.0')
-  call assert_equal(string(str2float('1.23')), '1.23')
-  call assert_equal(string(str2float('1.23abc')), '1.23')
-  call assert_equal(string(str2float('1e40')), '1.0e40')
-  call assert_equal(string(str2float('1e1000')), 'inf')
-  call assert_equal(string(str2float('inf')), 'inf')
-  call assert_equal(string(str2float('-inf')), '-inf')
-  call assert_equal(string(str2float('Inf')), 'inf')
-  call assert_equal(string(str2float('nan')), 'nan')
-  call assert_equal(string(str2float('NaN')), 'nan')
+  call assert_equal('1.0', string(str2float('1')))
+  call assert_equal('1.23', string(str2float('1.23')))
+  call assert_equal('1.23', string(str2float('1.23abc')))
+  call assert_equal('1.0e40', string(str2float('1e40')))
+  call assert_equal('inf', string(str2float('1e1000')))
+  call assert_equal('inf', string(str2float('inf')))
+  call assert_equal('-inf', string(str2float('-inf')))
+  call assert_equal('inf', string(str2float('Inf')))
+  call assert_equal('nan', string(str2float('nan')))
+  call assert_equal('nan', string(str2float('NaN')))
 endfunc
 
 func Test_floor()
-  call assert_equal(string(floor(2.0)), '2.0')
-  call assert_equal(string(floor(2.11)), '2.0')
-  call assert_equal(string(floor(2.99)), '2.0')
-  call assert_equal(string(floor(-2.11)), '-3.0')
-  call assert_equal(string(floor(-2.99)), '-3.0')
-  call assert_equal(string(floor(0.0/0.0)), 'nan')
-  call assert_equal(string(floor(1.0/0.0)), 'inf')
-  call assert_equal(string(floor(-1.0/0.0)), '-inf')
+  call assert_equal('2.0', string(floor(2.0)))
+  call assert_equal('2.0', string(floor(2.11)))
+  call assert_equal('2.0', string(floor(2.99)))
+  call assert_equal('-3.0', string(floor(-2.11)))
+  call assert_equal('-3.0', string(floor(-2.99)))
+  call assert_equal('nan', string(floor(0.0/0.0)))
+  call assert_equal('inf', string(floor(1.0/0.0)))
+  call assert_equal('-inf', string(floor(-1.0/0.0)))
 endfunc
 
 func Test_ceil()
-  call assert_equal(string(ceil(2.0)), '2.0')
-  call assert_equal(string(ceil(2.11)), '3.0')
-  call assert_equal(string(ceil(2.99)), '3.0')
-  call assert_equal(string(ceil(-2.11)), '-2.0')
-  call assert_equal(string(ceil(-2.99)), '-2.0')
-  call assert_equal(string(ceil(0.0/0.0)), 'nan')
-  call assert_equal(string(ceil(1.0/0.0)), 'inf')
-  call assert_equal(string(ceil(-1.0/0.0)), '-inf')
+  call assert_equal('2.0', string(ceil(2.0)))
+  call assert_equal('3.0', string(ceil(2.11)))
+  call assert_equal('3.0', string(ceil(2.99)))
+  call assert_equal('-2.0', string(ceil(-2.11)))
+  call assert_equal('-2.0', string(ceil(-2.99)))
+  call assert_equal('nan', string(ceil(0.0/0.0)))
+  call assert_equal('inf', string(ceil(1.0/0.0)))
+  call assert_equal('-inf', string(ceil(-1.0/0.0)))
 endfunc
 
 func Test_round()
-  call assert_equal(string(round(2.1)), '2.0')
-  call assert_equal(string(round(2.5)), '3.0')
-  call assert_equal(string(round(2.9)), '3.0')
-  call assert_equal(string(round(-2.1)), '-2.0')
-  call assert_equal(string(round(-2.5)), '-3.0')
-  call assert_equal(string(round(-2.9)), '-3.0')
-  call assert_equal(string(round(0.0/0.0)), 'nan')
-  call assert_equal(string(round(1.0/0.0)), 'inf')
-  call assert_equal(string(round(-1.0/0.0)), '-inf')
+  call assert_equal('2.0', string(round(2.1)))
+  call assert_equal('3.0', string(round(2.5)))
+  call assert_equal('3.0', string(round(2.9)))
+  call assert_equal('-2.0', string(round(-2.1)))
+  call assert_equal('-3.0', string(round(-2.5)))
+  call assert_equal('-3.0', string(round(-2.9)))
+  call assert_equal('nan', string(round(0.0/0.0)))
+  call assert_equal('inf', string(round(1.0/0.0)))
+  call assert_equal('-inf', string(round(-1.0/0.0)))
 endfunc
 
 func Test_trunc()
-  call assert_equal(string(trunc(2.1)), '2.0')
-  call assert_equal(string(trunc(2.5)), '2.0')
-  call assert_equal(string(trunc(2.9)), '2.0')
-  call assert_equal(string(trunc(-2.1)), '-2.0')
-  call assert_equal(string(trunc(-2.5)), '-2.0')
-  call assert_equal(string(trunc(-2.9)), '-2.0')
-  call assert_equal(string(trunc(0.0/0.0)), 'nan')
-  call assert_equal(string(trunc(1.0/0.0)), 'inf')
-  call assert_equal(string(trunc(-1.0/0.0)), '-inf')
+  call assert_equal('2.0', string(trunc(2.1)))
+  call assert_equal('2.0', string(trunc(2.5)))
+  call assert_equal('2.0', string(trunc(2.9)))
+  call assert_equal('-2.0', string(trunc(-2.1)))
+  call assert_equal('-2.0', string(trunc(-2.5)))
+  call assert_equal('-2.0', string(trunc(-2.9)))
+  call assert_equal('nan', string(trunc(0.0/0.0)))
+  call assert_equal('inf', string(trunc(1.0/0.0)))
+  call assert_equal('-inf', string(trunc(-1.0/0.0)))
 endfunc
 
 func Test_isnan()
-  call assert_equal(isnan(1.0), 0)
-  call assert_equal(isnan(0.0/0.0), 1)
-  call assert_equal(isnan(1.0/0.0), 0)
-  call assert_equal(isnan('a'), 0)
-  call assert_equal(isnan([]), 0)
+  call assert_equal(0, isnan(1.0))
+  call assert_equal(1, isnan(0.0/0.0))
+  call assert_equal(0, isnan(1.0/0.0))
+  call assert_equal(0, isnan('a'))
+  call assert_equal(0, isnan([]))
 endfunc
diff --git a/src/version.c b/src/version.c
index 824a29275f..38be7db00e 100644
--- a/src/version.c
+++ b/src/version.c
@@ -764,6 +764,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    158,
 /**/
     157,
 /**/

From c695cec4698b41d7b9555efdd47dda9b1945d3ae Mon Sep 17 00:00:00 2001
From: Bram Moolenaar <Bram@vim.org>
Date: Sun, 8 Jan 2017 20:00:04 +0100
Subject: [PATCH 09/10] patch 8.0.0159: crash on startup when updating tabline

Problem:    Using a NULL pointer when using feedkeys() to trigger drawing a
            tabline.
Solution:   Skip drawing a tabline if TabPageIdxs is NULL. (Dominique Pelle)
            Also fix recursing into getcmdline() from the cmd window.
---
 src/ex_getln.c | 2 ++
 src/screen.c   | 4 +++-
 src/version.c  | 2 ++
 3 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/ex_getln.c b/src/ex_getln.c
index 5d098cca3f..cf99ae2a83 100644
--- a/src/ex_getln.c
+++ b/src/ex_getln.c
@@ -772,7 +772,9 @@ getcmdline(
 		/*
 		 * Open a window to edit the command line (and history).
 		 */
+		save_cmdline(&save_ccline);
 		c = ex_window();
+		restore_cmdline(&save_ccline);
 		some_key_typed = TRUE;
 	    }
 	}
diff --git a/src/screen.c b/src/screen.c
index ee61a01aea..016e7ee3e9 100644
--- a/src/screen.c
+++ b/src/screen.c
@@ -3650,7 +3650,7 @@ win_line(
 		if (fdc > 0)
 		{
 		    /* Draw the 'foldcolumn'.  Allocate a buffer, "extra" may
-		     * already be in used. */
+		     * already be in use. */
 		    p_extra_free = alloc(12 + 1);
 
 		    if (p_extra_free != NULL)
@@ -10344,6 +10344,8 @@ draw_tabline(void)
 #endif
 					    );
 
+    if (ScreenLines == NULL)
+	return;
     redraw_tabline = FALSE;
 
 #ifdef FEAT_GUI_TABLINE
diff --git a/src/version.c b/src/version.c
index 38be7db00e..f1a36da0ce 100644
--- a/src/version.c
+++ b/src/version.c
@@ -764,6 +764,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    159,
 /**/
     158,
 /**/

From de33011ec623fd562419dede6bf465b5b9881a20 Mon Sep 17 00:00:00 2001
From: Bram Moolenaar <Bram@vim.org>
Date: Sun, 8 Jan 2017 20:50:52 +0100
Subject: [PATCH 10/10] patch 8.0.0160: EMSG() is sometimes used where it
 should be IEMSG()

Problem:    EMSG() is sometimes used for internal errors.
Solution:   Change them to IEMSG(). (Dominique Pelle)  And a few more.
---
 src/channel.c    | 2 +-
 src/eval.c       | 2 +-
 src/regexp_nfa.c | 8 ++++----
 src/version.c    | 2 ++
 4 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/src/channel.c b/src/channel.c
index 32f3527f79..f409e1d209 100644
--- a/src/channel.c
+++ b/src/channel.c
@@ -1567,7 +1567,7 @@ invoke_callback(channel_T *channel, char_u *callback, partial_T *partial,
     int		dummy;
 
     if (safe_to_invoke_callback == 0)
-	EMSG("INTERNAL: Invoking callback when it is not safe");
+	IEMSG("INTERNAL: Invoking callback when it is not safe");
 
     argv[0].v_type = VAR_CHANNEL;
     argv[0].vval.v_channel = channel;
diff --git a/src/eval.c b/src/eval.c
index 70fbc8863b..11fc035fb4 100644
--- a/src/eval.c
+++ b/src/eval.c
@@ -270,7 +270,7 @@ eval_init(void)
 	p = &vimvars[i];
 	if (STRLEN(p->vv_name) > 16)
 	{
-	    EMSG("INTERNAL: name too long, increase size of dictitem16_T");
+	    IEMSG("INTERNAL: name too long, increase size of dictitem16_T");
 	    getout(1);
 	}
 	STRCPY(p->vv_di.di_key, p->vv_name);
diff --git a/src/regexp_nfa.c b/src/regexp_nfa.c
index fcca818288..919dadcb0c 100644
--- a/src/regexp_nfa.c
+++ b/src/regexp_nfa.c
@@ -1359,7 +1359,7 @@ nfa_regatom(void)
 		    rc_did_emsg = TRUE;
 		    return FAIL;
 		}
-		EMSGN("INTERNAL: Unknown character class char: %ld", c);
+		IEMSGN("INTERNAL: Unknown character class char: %ld", c);
 		return FAIL;
 	    }
 #ifdef FEAT_MBYTE
@@ -4925,7 +4925,7 @@ check_char_class(int class, int c)
 
 	default:
 	    /* should not be here :P */
-	    EMSGN(_(e_ill_char_class), class);
+	    IEMSGN(_(e_ill_char_class), class);
 	    return FAIL;
     }
     return FAIL;
@@ -6688,7 +6688,7 @@ nfa_regmatch(
 
 #ifdef DEBUG
 		if (c < 0)
-		    EMSGN("INTERNAL: Negative state char: %ld", c);
+		    IEMSGN("INTERNAL: Negative state char: %ld", c);
 #endif
 		result = (c == curc);
 
@@ -7216,7 +7216,7 @@ nfa_regcomp(char_u *expr, int re_flags)
     {
 	/* TODO: only give this error for debugging? */
 	if (post_ptr >= post_end)
-	    EMSGN("Internal error: estimated max number of states insufficient: %ld", post_end - post_start);
+	    IEMSGN("Internal error: estimated max number of states insufficient: %ld", post_end - post_start);
 	goto fail;	    /* Cascaded (syntax?) error */
     }
 
diff --git a/src/version.c b/src/version.c
index f1a36da0ce..641c72c40f 100644
--- a/src/version.c
+++ b/src/version.c
@@ -764,6 +764,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    160,
 /**/
     159,
 /**/