7 files changed, 41 insertions, 67 deletions
diff --git a/src/nvim/testdir/Makefile b/src/nvim/testdir/Makefile
index 55a49122d5..4debdd9acc 100644
--- a/src/nvim/testdir/Makefile
+++ b/src/nvim/testdir/Makefile
@@ -36,9 +36,12 @@ SCRIPTS := \
            test_breakindent.out   \
            test_close_count.out   \
            test_marks.out         \
-           test_match_conceal.out \
 
-NEW_TESTS = test_viml.res
+# Tests using runtest.vim.vim.
+# Keep test_alot*.res as the last one, sort the others.
+NEW_TESTS = \
+	    test_viml.res \
+	    test_alot.res
 
 SCRIPTS_GUI := test16.out
 
diff --git a/src/nvim/testdir/test17.in b/src/nvim/testdir/test17.in
index 7fef87d383..a8c81b832d 100644
--- a/src/nvim/testdir/test17.in
+++ b/src/nvim/testdir/test17.in
@@ -41,17 +41,17 @@ STARTTEST
 :!mkdir Xdir1
 :!mkdir "Xdir1/dir2"
 :e! Xdir1/dir2/foo.a
-i#include   "bar.a"
+i#include   "bar.a":
 :w
 :e Xdir1/dir2/bar.a
-i#include      "baz.a"
+i#include      "baz.a":
 :w
 :e Xdir1/dir2/baz.a
-i#include            "foo.a"
+i#include            "foo.a":
 :w
 :e Xbase.a
 :set path=Xdir1/dir2
-i#include    <foo.a>
+i#include    <foo.a>:
 :w
 :redir! >>test.out
 :checkpath!
@@ -71,17 +71,17 @@ STARTTEST
 :endfunction
 :let &includeexpr='DotsToSlashes()'
 :e! Xdir1/dir2/foo.b
-i%inc   /bar/
+i%inc   /bar/:
 :w
 :e Xdir1/dir2/bar.b
-i%inc      /baz/
+i%inc      /baz/:
 :w
 :e Xdir1/dir2/baz.b
-i%inc            /foo/
+i%inc            /foo/:
 :w
 :e Xbase.b
 :set path=Xdir1/dir2
-i%inc    /foo/
+i%inc    /foo/:
 :w
 :redir! >>test.out
 :checkpath!
@@ -104,20 +104,20 @@ STARTTEST
 :endfunction
 :let &includeexpr='StripNewlineChar()'
 :e! Xdir1/dir2/foo.c
-i%inc   bar.c
+i%inc   bar.c:
 :w
 :e Xdir1/dir2/bar.c
-i%inc      baz.c
+i%inc      baz.c:
 :w
 :e Xdir1/dir2/baz.c
-i%inc            foo.c
+i%inc            foo.c:
 :w
 :e Xdir1/dir2/FALSE.c
-i%inc            foo.c
+i%inc            foo.c:
 :w
 :e Xbase.c
 :set path=Xdir1/dir2
-i%inc    FALSE.c foo.c
+i%inc    FALSE.c foo.c:
 :w
 :redir! >>test.out
 :checkpath!
diff --git a/src/nvim/testdir/test49.in b/src/nvim/testdir/test49.in
index 1ce57246ee..d95052e14c 100644
--- a/src/nvim/testdir/test49.in
+++ b/src/nvim/testdir/test49.in
@@ -8,7 +8,9 @@ STARTTEST
 :se nomore
 :lang mess C
 :so test49.vim
-GGGGGGGGGGGGGG"rp:.-,$w! test.out
+:" Go back to this file and append the results from register r.
+:buf test49.in
+G"rp:/^Results/,$w! test.out
 :"
 :" make valgrind happy
 :redir => funclist
diff --git a/src/nvim/testdir/test_alot.vim b/src/nvim/testdir/test_alot.vim
new file mode 100644
index 0000000000..1d1da94bac
--- /dev/null
+++ b/src/nvim/testdir/test_alot.vim
@@ -0,0 +1,3 @@
+" A series of tests that can run in one Vim invocation.
+" This makes testing go faster, since Vim doesn't need to restart.
+
diff --git a/src/nvim/testdir/test_marks.in b/src/nvim/testdir/test_marks.in
deleted file mode 100644
index 23c2fb65fe..0000000000
--- a/src/nvim/testdir/test_marks.in
+++ /dev/null
@@ -1,34 +0,0 @@
-Tests for marks.
-
-STARTTEST
-:so small.vim
-:" test that a deleted mark is restored after delete-undo-redo-undo
-:/^\t/+1
-:set nocp viminfo+=nviminfo
-madduu
-:let a = string(getpos("'a"))
-:$put ='Mark after delete-undo-redo-undo: '.a
-:''
-ENDTEST
-
-	textline A
-	textline B
-	textline C
-
-STARTTEST
-:" test that CTRL-A and CTRL-X updates last changed mark '[, '].
-:/^123/
-:execute "normal! \<C-A>`[v`]rAjwvjw\<C-X>`[v`]rX"
-ENDTEST
-
-CTRL-A CTRL-X:
-123 123 123
-123 123 123
-123 123 123
-
-STARTTEST
-:g/^STARTTEST/.,/^ENDTEST/d
-:wq! test.out
-ENDTEST
-
-Results:
diff --git a/src/nvim/testdir/test_marks.ok b/src/nvim/testdir/test_marks.ok
deleted file mode 100644
index e6c02ee7b0..0000000000
--- a/src/nvim/testdir/test_marks.ok
+++ /dev/null
@@ -1,16 +0,0 @@
-Tests for marks.
-
-
-	textline A
-	textline B
-	textline C
-
-
-CTRL-A CTRL-X:
-AAA 123 123
-123 XXXXXXX
-XXX 123 123
-
-
-Results:
-Mark after delete-undo-redo-undo: [0, 15, 2, 0]
diff --git a/src/nvim/testdir/test_viml.vim b/src/nvim/testdir/test_viml.vim
index 5d65953a9e..9f0618bd45 100644
--- a/src/nvim/testdir/test_viml.vim
+++ b/src/nvim/testdir/test_viml.vim
@@ -1,5 +1,5 @@
 " Test various aspects of the Vim language.
-" This was formerly in test49.
+" Most of this was formerly in test49.
 
 "-------------------------------------------------------------------------------
 " Test environment							    {{{1
@@ -908,6 +908,22 @@ endfunc
 
 
 "-------------------------------------------------------------------------------
+" Test 16:  Recognizing {} in variable name.			    {{{1
+"-------------------------------------------------------------------------------
+
+func Test_curlies()
+    let s:var = 66
+    let ns = 's'
+    call assert_equal(66, {ns}:var)
+
+    let g:a = {}
+    let g:b = 't'
+    let g:a[g:b] = 77
+    call assert_equal(77, g:a['t'])
+endfunc
+
+
+"-------------------------------------------------------------------------------
 " Modelines								    {{{1
 " vim: ts=8 sw=4 tw=80 fdm=marker
 " vim: fdt=substitute(substitute(foldtext(),\ '\\%(^+--\\)\\@<=\\(\\s*\\)\\(.\\{-}\\)\:\ \\%(\"\ \\)\\=\\(Test\ \\d*\\)\:\\s*',\ '\\3\ (\\2)\:\ \\1',\ \"\"),\ '\\(Test\\s*\\)\\(\\d\\)\\D\\@=',\ '\\1\ \\2',\ "")