aboutsummaryrefslogtreecommitdiff
path: root/src/nvim/testdir
diff options
context:
space:
mode:
authorJames McCoy <jamessan@jamessan.com>2016-11-15 14:57:57 -0500
committerGitHub <noreply@github.com>2016-11-15 14:57:57 -0500
commitc91e9c1c7af48ad55a19a77b34fcabe6029fd956 (patch)
tree894220772bbfb8e882bff5a2e617640efd656329 /src/nvim/testdir
parentc69cfd7d1c12fa895961289c7b2fcbeccff5a739 (diff)
parent12ed735719547a48aa4628c37dc5e18ac40852b5 (diff)
downloadrneovim-c91e9c1c7af48ad55a19a77b34fcabe6029fd956.tar.gz
rneovim-c91e9c1c7af48ad55a19a77b34fcabe6029fd956.tar.bz2
rneovim-c91e9c1c7af48ad55a19a77b34fcabe6029fd956.zip
Merge pull request #5611 from jamessan/vim-7.4.2174
vim-patch:7.4.2174
Diffstat (limited to 'src/nvim/testdir')
-rw-r--r--src/nvim/testdir/test_alot.vim1
-rw-r--r--src/nvim/testdir/test_options.vim40
2 files changed, 41 insertions, 0 deletions
diff --git a/src/nvim/testdir/test_alot.vim b/src/nvim/testdir/test_alot.vim
index 60f264fb3f..156604051d 100644
--- a/src/nvim/testdir/test_alot.vim
+++ b/src/nvim/testdir/test_alot.vim
@@ -10,6 +10,7 @@ source test_expr_utf8.vim
source test_feedkeys.vim
source test_cmdline.vim
source test_menu.vim
+source test_options.vim
source test_popup.vim
source test_regexp_utf8.vim
source test_syn_attr.vim
diff --git a/src/nvim/testdir/test_options.vim b/src/nvim/testdir/test_options.vim
new file mode 100644
index 0000000000..cceb180189
--- /dev/null
+++ b/src/nvim/testdir/test_options.vim
@@ -0,0 +1,40 @@
+" Test for options
+
+function! Test_whichwrap()
+ set whichwrap=b,s
+ call assert_equal('b,s', &whichwrap)
+
+ set whichwrap+=h,l
+ call assert_equal('b,s,h,l', &whichwrap)
+
+ set whichwrap+=h,l
+ call assert_equal('b,s,h,l', &whichwrap)
+
+ set whichwrap+=h,l
+ call assert_equal('b,s,h,l', &whichwrap)
+
+ set whichwrap&
+endfunction
+
+function! Test_options()
+ let caught = 'ok'
+ try
+ options
+ catch
+ let caught = v:throwpoint . "\n" . v:exception
+ endtry
+ call assert_equal('ok', caught)
+
+ " close option-window
+ close
+endfunction
+
+function! Test_path_keep_commas()
+ " Test that changing 'path' keeps two commas.
+ set path=foo,,bar
+ set path-=bar
+ set path+=bar
+ call assert_equal('foo,,bar', &path)
+
+ set path&
+endfunction