summaryrefslogtreecommitdiffstats
path: root/src/testdir
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2017-03-05 19:44:06 +0100
committerBram Moolenaar <Bram@vim.org>2017-03-05 19:44:06 +0100
commit6b64394f346594404cffb9591d71ac693040679f (patch)
tree071c5aee49d73707a14ed71834adb1463b59fa44 /src/testdir
parentf411a3c5aff644ec7a999be83ef22adf3e1132dd (diff)
patch 8.0.0423: changing 'cinoptions' does not always workv8.0.0423
Problem: The effect of adding "#" to 'cinoptions' is not always removed. (David Briscoe) Solution: Reset b_ind_hash_comment. (Christian Brabandt, closes #1475)
Diffstat (limited to 'src/testdir')
-rw-r--r--src/testdir/Make_all.mak1
-rw-r--r--src/testdir/test3.in3
-rw-r--r--src/testdir/test_cindent.vim16
3 files changed, 19 insertions, 1 deletions
diff --git a/src/testdir/Make_all.mak b/src/testdir/Make_all.mak
index e1ce1518fc..b7fb15caf6 100644
--- a/src/testdir/Make_all.mak
+++ b/src/testdir/Make_all.mak
@@ -143,6 +143,7 @@ NEW_TESTS = test_arabic.res \
test_cdo.res \
test_channel.res \
test_charsearch.res \
+ test_cindent.res \
test_cmdline.res \
test_command_count.res \
test_crypt.res \
diff --git a/src/testdir/test3.in b/src/testdir/test3.in
index e8648d382c..9e66436e7d 100644
--- a/src/testdir/test3.in
+++ b/src/testdir/test3.in
@@ -1,6 +1,7 @@
/* vim: set cin ts=4 sw=4 : */
-Test for 'cindent'
+Test for 'cindent'.
+For new tests, consider putting them in test_cindent.vim.
STARTTEST
:so small.vim
diff --git a/src/testdir/test_cindent.vim b/src/testdir/test_cindent.vim
new file mode 100644
index 0000000000..5685c2be66
--- /dev/null
+++ b/src/testdir/test_cindent.vim
@@ -0,0 +1,16 @@
+" Test for cinoptions and cindent
+"
+" TODO: rewrite test3.in into this new style test
+
+func Test_cino_hash()
+ " Test that curbuf->b_ind_hash_comment is correctly reset
+ new
+ setlocal cindent cinoptions=#1
+ setlocal cinoptions=
+ call setline(1, ["#include <iostream>"])
+ call cursor(1, 1)
+ norm! o#include
+ "call feedkeys("o#include\<esc>", 't')
+ call assert_equal(["#include <iostream>", "#include"], getline(1,2))
+ bwipe!
+endfunc