Merge pull request #4649 from justinmk/vimpatches

vim-patch:7.4.1092

6 files changed, 80 insertions, 4 deletions

diff --git a/src/nvim/eval.c b/src/nvim/eval.c
index 8b04d9afa4..0ff70df54d 100644
--- a/src/nvim/eval.c
+++ b/src/nvim/eval.c
@@ -6666,6 +6666,7 @@ static struct fst {
   { "argv",              0, 1, f_argv },
   { "asin",              1, 1, f_asin },    // WJMc
   { "assert_equal",      2, 3, f_assert_equal },
+  { "assert_exception",  1, 2, f_assert_exception },
   { "assert_false",      1, 2, f_assert_false },
   { "assert_true",       1, 2, f_assert_true },
   { "atan",              1, 1, f_atan },
@@ -7628,6 +7629,26 @@ static void f_assert_equal(typval_T *argvars, typval_T *rettv)
   }
 }
 
+/// "assert_exception(string[, msg])" function
+static void f_assert_exception(typval_T *argvars, typval_T *rettv)
+{
+  garray_T ga;
+
+  char *error = (char *)get_tv_string_chk(&argvars[0]);
+  if (vimvars[VV_EXCEPTION].vv_str == NULL) {
+    prepare_assert_error(&ga);
+    ga_concat(&ga, (char_u *)"v:exception is not set");
+    assert_error(&ga);
+    ga_clear(&ga);
+  } else if (strstr((char *)vimvars[VV_EXCEPTION].vv_str, error) == NULL) {
+    prepare_assert_error(&ga);
+    fill_assert_error(&ga, &argvars[1], NULL, &argvars[0],
+                      &vimvars[VV_EXCEPTION].vv_tv);
+    assert_error(&ga);
+    ga_clear(&ga);
+  }
+}
+
 // Common for assert_true() and assert_false().
 static void assert_bool(typval_T *argvars, bool is_true)
 {
@@ -10174,6 +10195,7 @@ static void getpos_both(typval_T *argvars, typval_T *rettv, bool getcurpos)
   list_append_number(l,
                      (fp != NULL) ? (varnumber_T)fp->coladd : (varnumber_T)0);
   if (getcurpos) {
+    update_curswant();
     list_append_number(l, curwin->w_curswant == MAXCOL
                               ? (varnumber_T)MAXCOL
                               : (varnumber_T)curwin->w_curswant + 1);
diff --git a/src/nvim/getchar.c b/src/nvim/getchar.c
index dba83d3684..43cdd7a033 100644
--- a/src/nvim/getchar.c
+++ b/src/nvim/getchar.c
@@ -1562,7 +1562,7 @@ int char_avail(void)
 {
   int retval;
 
-  ++no_mapping;
+  no_mapping++;
   retval = vpeekc();
   --no_mapping;
   return retval != NUL;
diff --git a/src/nvim/testdir/Makefile b/src/nvim/testdir/Makefile
index 4debdd9acc..82c7cd4de9 100644
--- a/src/nvim/testdir/Makefile
+++ b/src/nvim/testdir/Makefile
@@ -41,6 +41,7 @@ SCRIPTS := \
 # Keep test_alot*.res as the last one, sort the others.
 NEW_TESTS = \
 	    test_viml.res \
+	    test_cursor_func.res \
 	    test_alot.res
 
 SCRIPTS_GUI := test16.out
diff --git a/src/nvim/testdir/runtest.vim b/src/nvim/testdir/runtest.vim
index 1c610eab51..6601dcf52f 100644
--- a/src/nvim/testdir/runtest.vim
+++ b/src/nvim/testdir/runtest.vim
@@ -62,6 +62,7 @@ else
 endif
 
 " Locate Test_ functions and execute them.
+set nomore
 redir @q
 function /^Test_
 redir END
diff --git a/src/nvim/testdir/test_cursor_func.vim b/src/nvim/testdir/test_cursor_func.vim
new file mode 100644
index 0000000000..d819b7b092
--- /dev/null
+++ b/src/nvim/testdir/test_cursor_func.vim
@@ -0,0 +1,52 @@
+" Tests for cursor().
+
+func Test_wrong_arguments()
+  try
+    call cursor(1. 3)
+    " not reached
+    call assert_false(1)
+  catch
+    call assert_exception('E474:')
+  endtry
+endfunc
+
+func Test_move_cursor()
+  new
+  call setline(1, ['aaa', 'bbb', 'ccc', 'ddd'])
+
+  call cursor([1, 1, 0, 1])
+  call assert_equal([1, 1, 0, 1], getcurpos()[1:])
+  call cursor([4, 3, 0, 3])
+  call assert_equal([4, 3, 0, 3], getcurpos()[1:])
+
+  call cursor(2, 2)
+  call assert_equal([2, 2, 0, 2], getcurpos()[1:])
+  " line number zero keeps the line number
+  call cursor(0, 1)
+  call assert_equal([2, 1, 0, 1], getcurpos()[1:])
+  " col number zero keeps the column
+  call cursor(3, 0)
+  call assert_equal([3, 1, 0, 1], getcurpos()[1:])
+  " below last line goes to last line
+  call cursor(9, 1)
+  call assert_equal([4, 1, 0, 1], getcurpos()[1:])
+
+  quit!
+endfunc
+
+" Very short version of what matchparen does.
+function s:Highlight_Matching_Pair()
+  let save_cursor = getcurpos()
+  call setpos('.', save_cursor)
+endfunc
+
+func Test_curswant_with_autocommand()
+  new
+  call setline(1, ['func()', '{', '}', '----'])
+  autocmd! CursorMovedI * call s:Highlight_Matching_Pair()
+  exe "normal! 3Ga\<Down>X\<Esc>"
+  call assert_equal('-X---', getline(4))
+  autocmd! CursorMovedI *
+  quit!
+endfunc
+
diff --git a/src/nvim/version.c b/src/nvim/version.c
index aed5a85a7f..4e379339be 100644
--- a/src/nvim/version.c
+++ b/src/nvim/version.c
@@ -377,7 +377,7 @@ static int included_patches[] = {
   // 1303 NA
   // 1302 NA
   // 1301 NA
-  // 1300,
+  // 1300 NA
   // 1299 NA
   // 1298 NA
   // 1297 NA
@@ -559,7 +559,7 @@ static int included_patches[] = {
   // 1121,
   1120,
   // 1119,
-  // 1118,
+  1118,
   1117,
   1116,
   // 1115 NA
@@ -585,7 +585,7 @@ static int included_patches[] = {
   // 1095 NA
   // 1094,
   1093,
-  // 1092,
+  1092,
   // 1091,
   // 1090,
   1089,