7 files changed, 92 insertions, 2 deletions
diff --git a/src/nvim/quickfix.c b/src/nvim/quickfix.c
index 6c26e53cd7..301f72fa79 100644
--- a/src/nvim/quickfix.c
+++ b/src/nvim/quickfix.c
@@ -2299,6 +2299,7 @@ static void qf_jump_goto_line(linenr_T qf_lnum, int qf_col, char_u qf_viscol,
           }
         }
       }
+      curwin->w_set_curswant = true;
       check_cursor();
     } else {
       beginline(BL_WHITE | BL_FIX);
diff --git a/src/nvim/syntax.c b/src/nvim/syntax.c
index 13fcad71fa..5a61238d8c 100644
--- a/src/nvim/syntax.c
+++ b/src/nvim/syntax.c
@@ -7327,6 +7327,7 @@ static void set_hl_attr(int idx)
 /// @param highlight name e.g. 'Cursor', 'Normal'
 /// @return the highlight id, else 0 if \p name does not exist
 int syn_name2id(const char_u *name)
+  FUNC_ATTR_NONNULL_ALL
 {
   int i;
   char_u name_u[200];
@@ -7345,12 +7346,13 @@ int syn_name2id(const char_u *name)
 
 /// Lookup a highlight group name and return its attributes.
 /// Return zero if not found.
-int syn_name2attr(char_u *name)
+int syn_name2attr(const char_u *name)
+  FUNC_ATTR_NONNULL_ALL
 {
   int id = syn_name2id(name);
 
   if (id != 0) {
-    return syn_id2attr(syn_get_final_id(id));
+    return syn_id2attr(id);
   }
   return 0;
 }
diff --git a/src/nvim/testdir/Makefile b/src/nvim/testdir/Makefile
index 03b1bae28f..d1a449c7cc 100644
--- a/src/nvim/testdir/Makefile
+++ b/src/nvim/testdir/Makefile
@@ -116,6 +116,8 @@ RM_ON_RUN   := test.out X* viminfo
 RM_ON_START := test.ok
 RUN_VIM     := $(TOOL) $(NVIM_PRG) -u unix.vim -U NONE -i viminfo --headless --noplugin -s dotest.in
 
+# Delete files that may interfere with running tests.  This includes some files
+# that may result from working on the tests, not only from running them.
 CLEAN_FILES := *.out \
   *.failed          \
   *.res             \
diff --git a/src/nvim/testdir/test_python2.vim b/src/nvim/testdir/test_python2.vim
index 647290e6b5..8d55b59c31 100644
--- a/src/nvim/testdir/test_python2.vim
+++ b/src/nvim/testdir/test_python2.vim
@@ -41,6 +41,7 @@ func Test_set_cursor()
 endfunc
 
 func Test_vim_function()
+  throw 'skipped: Nvim does not support vim.bindeval()'
   " Check creating vim.Function object
   py import vim
 
diff --git a/src/nvim/testdir/test_python3.vim b/src/nvim/testdir/test_python3.vim
index 26aaab31ed..cd07b0883f 100644
--- a/src/nvim/testdir/test_python3.vim
+++ b/src/nvim/testdir/test_python3.vim
@@ -41,6 +41,7 @@ func Test_set_cursor()
 endfunc
 
 func Test_vim_function()
+  throw 'skipped: Nvim does not support vim.bindeval()'
   " Check creating vim.Function object
   py3 import vim
 
diff --git a/src/nvim/testdir/test_quickfix.vim b/src/nvim/testdir/test_quickfix.vim
index 16f008ca41..b7f45aeeb1 100644
--- a/src/nvim/testdir/test_quickfix.vim
+++ b/src/nvim/testdir/test_quickfix.vim
@@ -3566,3 +3566,12 @@ func Test_view_result_split()
   call Xview_result_split_tests('c')
   call Xview_result_split_tests('l')
 endfunc
+
+" Test that :cc sets curswant
+func Test_curswant()
+  helpgrep quickfix
+  normal! llll
+  1cc
+  call assert_equal(getcurpos()[4], virtcol('.'))
+  cclose | helpclose
+endfunc
diff --git a/src/nvim/testdir/test_ruby.vim b/src/nvim/testdir/test_ruby.vim
new file mode 100644
index 0000000000..ef1a2d25b7
--- /dev/null
+++ b/src/nvim/testdir/test_ruby.vim
@@ -0,0 +1,74 @@
+" Tests for ruby interface
+
+if !has('ruby')
+  finish
+end
+
+func Test_ruby_change_buffer()
+  call setline(line('$'), ['1 line 1'])
+  ruby Vim.command("normal /^1\n")
+  ruby $curbuf.line = "1 changed line 1"
+  call assert_equal('1 changed line 1', getline('$'))
+endfunc
+
+func Test_ruby_evaluate_list()
+  throw 'skipped: TODO: '
+  call setline(line('$'), ['2 line 2'])
+  ruby Vim.command("normal /^2\n")
+  let l = ["abc", "def"]
+  ruby << EOF
+  curline = $curbuf.line_number
+  l = Vim.evaluate("l");
+  $curbuf.append(curline, l.join("\n"))
+EOF
+  normal j
+  .rubydo $_ = $_.gsub(/\n/, '/')
+  call assert_equal('abc/def', getline('$'))
+endfunc
+
+func Test_ruby_evaluate_dict()
+  let d = {'a': 'foo', 'b': 123}
+  redir => l:out
+  ruby d = Vim.evaluate("d"); print d
+  redir END
+  call assert_equal(['{"a"=>"foo", "b"=>123}'], split(l:out, "\n"))
+endfunc
+
+func Test_rubydo()
+  throw 'skipped: TODO: '
+  " Check deleting lines does not trigger ml_get error.
+  new
+  call setline(1, ['one', 'two', 'three'])
+  rubydo Vim.command("%d_")
+  bwipe!
+
+  " Check switching to another buffer does not trigger ml_get error.
+  new
+  let wincount = winnr('$')
+  call setline(1, ['one', 'two', 'three'])
+  rubydo Vim.command("new")
+  call assert_equal(wincount + 1, winnr('$'))
+  bwipe!
+  bwipe!
+endfunc
+
+func Test_rubyfile()
+  " Check :rubyfile does not SEGV with Ruby level exception but just fails
+  let tempfile = tempname() . '.rb'
+  call writefile(['raise "vim!"'], tempfile)
+  call assert_fails('rubyfile ' . tempfile)
+  call delete(tempfile)
+endfunc
+
+func Test_set_cursor()
+  " Check that setting the cursor position works.
+  new
+  call setline(1, ['first line', 'second line'])
+  normal gg
+  rubydo $curwin.cursor = [1, 5]
+  call assert_equal([1, 6], [line('.'), col('.')])
+
+  " Check that movement after setting cursor position keeps current column.
+  normal j
+  call assert_equal([2, 6], [line('.'), col('.')])
+endfunc