diff options
| author | Justin M. Keyes <justinkz@gmail.com> | 2014-05-27 16:51:52 -0400 |
|---|---|---|
| committer | Justin M. Keyes <justinkz@gmail.com> | 2014-05-27 16:52:01 -0400 |
| commit | dcc2b25529e3e6cdd89bf7ed19e24d6a73a2e8c3 (patch) | |
| tree | bcf0f4d7be21ac0055aa1c091e96caca44046d6e /src/nvim/testdir | |
| parent | 1b43e5c47e3887696d53573fba7fce6221888794 (diff) | |
| parent | 753401ab4cea8fc81731403fe587558e36e7388f (diff) | |
| download | rneovim-dcc2b25529e3e6cdd89bf7ed19e24d6a73a2e8c3.tar.gz rneovim-dcc2b25529e3e6cdd89bf7ed19e24d6a73a2e8c3.tar.bz2 rneovim-dcc2b25529e3e6cdd89bf7ed19e24d6a73a2e8c3.zip | |
Merge #756 'vim-patch:7.4.267'
Diffstat (limited to 'src/nvim/testdir')
| -rw-r--r-- | src/nvim/testdir/Makefile | 3 | ||||
| -rw-r--r-- | src/nvim/testdir/test_autoformat_join.in | 23 | ||||
| -rw-r--r-- | src/nvim/testdir/test_autoformat_join.ok | 8 |
3 files changed, 33 insertions, 1 deletions
diff --git a/src/nvim/testdir/Makefile b/src/nvim/testdir/Makefile index 2497f8a5ba..5582a9f159 100644 --- a/src/nvim/testdir/Makefile +++ b/src/nvim/testdir/Makefile @@ -6,7 +6,8 @@ export SHELL := sh VIMPROG := ../../../build/bin/nvim -SCRIPTS := test_eval.out \ +SCRIPTS := test_autoformat_join.out \ + test_eval.out \ test1.out test2.out test3.out test4.out test5.out \ test6.out test7.out test8.out test9.out test10.out \ test11.out test12.out test13.out test14.out test15.out \ diff --git a/src/nvim/testdir/test_autoformat_join.in b/src/nvim/testdir/test_autoformat_join.in new file mode 100644 index 0000000000..f1e1c868d3 --- /dev/null +++ b/src/nvim/testdir/test_autoformat_join.in @@ -0,0 +1,23 @@ +Tests for setting the '[,'] marks when joining lines. + +STARTTEST +:so small.vim +:/^\t\t/ +0gqj +:let a=string(getpos("'[")).'/'.string(getpos("']")) +:/^This line/;'}-join +:let b=string(getpos("'[")).'/'.string(getpos("']")) +:$put ='First test: Start/End '.string(a) +:$put ='Second test: Start/End '.string(b) +:/^\t\t/,$wq! test.out +ENDTEST + + + O sodales, ludite, vos qui +attamen consulite per voster honur. Tua pulchra facies me fay planszer milies + +This line. +Should be joined with the next line +and with this line + +Results: diff --git a/src/nvim/testdir/test_autoformat_join.ok b/src/nvim/testdir/test_autoformat_join.ok new file mode 100644 index 0000000000..3b1df79514 --- /dev/null +++ b/src/nvim/testdir/test_autoformat_join.ok @@ -0,0 +1,8 @@ + O sodales, ludite, vos qui attamen consulite per voster honur. +Tua pulchra facies me fay planszer milies + +This line. Should be joined with the next line and with this line + +Results: +First test: Start/End '[0, 16, 1, 0]/[0, 17, 1, 0]' +Second test: Start/End '[0, 19, 11, 0]/[0, 19, 67, 0]' |