summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2019-04-20 23:47:46 +0200
committerBram Moolenaar <Bram@vim.org>2019-04-20 23:47:46 +0200
commit037c54f261818439755d56e318da068f97997fb5 (patch)
treea0045955e2b9f55971423cc399980bbba6d89731
parent4c25bd785aa8b565bf973cbba12ed36b76daaa4f (diff)
downloadvim-git-037c54f261818439755d56e318da068f97997fb5.tar.gz
patch 8.1.1193: typos and small problems in test filesv8.1.1193
Problem: Typos and small problems in test files. Solution: Small improvements.
-rw-r--r--src/testdir/test_gn.vim2
-rw-r--r--src/testdir/test_quotestar.vim2
-rw-r--r--src/testdir/test_registers.vim2
-rw-r--r--src/testdir/test_syntax.vim4
-rw-r--r--src/testdir/test_tabpage.vim3
-rw-r--r--src/testdir/test_vartabs.vim7
-rw-r--r--src/version.c2
7 files changed, 15 insertions, 7 deletions
diff --git a/src/testdir/test_gn.vim b/src/testdir/test_gn.vim
index d0fdafcaa..fc7e89190 100644
--- a/src/testdir/test_gn.vim
+++ b/src/testdir/test_gn.vim
@@ -2,7 +2,7 @@
func Test_gn_command()
noautocmd new
- " replace a single char by itsself quoted:
+ " replace a single char by itself quoted:
call setline('.', 'abc x def x ghi x jkl')
let @/ = 'x'
exe "norm! cgn'x'\<esc>.."
diff --git a/src/testdir/test_quotestar.vim b/src/testdir/test_quotestar.vim
index ce5a9ee82..c7e38aef6 100644
--- a/src/testdir/test_quotestar.vim
+++ b/src/testdir/test_quotestar.vim
@@ -97,7 +97,7 @@ func Do_test_quotestar_for_x11()
if has('unix') && has('gui') && !has('gui_running')
let @* = ''
- " Running in a terminal and the GUI is avaiable: Tell the server to open
+ " Running in a terminal and the GUI is available: Tell the server to open
" the GUI and check that the remote command still works.
" Need to wait for the GUI to start up, otherwise the send hangs in trying
" to send to the terminal window.
diff --git a/src/testdir/test_registers.vim b/src/testdir/test_registers.vim
index ebcc8e1d0..1b8653e62 100644
--- a/src/testdir/test_registers.vim
+++ b/src/testdir/test_registers.vim
@@ -163,5 +163,7 @@ func Test_recording_esc_sequence()
bwipe!
if exists('save_F2')
let t_F2 = save_F2
+ else
+ set t_F2=
endif
endfunc
diff --git a/src/testdir/test_syntax.vim b/src/testdir/test_syntax.vim
index c0be4a0ef..143f97ae8 100644
--- a/src/testdir/test_syntax.vim
+++ b/src/testdir/test_syntax.vim
@@ -34,7 +34,7 @@ func Test_syn_iskeyword()
\ 'CREATE TABLE FOOBAR(',
\ ' DLTD_BY VARCHAR2(100)',
\ ');',
- \ ''])
+ \ ''])
syntax on
set ft=sql
@@ -519,7 +519,7 @@ func Test_synstack_synIDtrans()
norm f/
call assert_equal(['cComment', 'cCommentStart'], map(synstack(line("."), col(".")), 'synIDattr(v:val, "name")'))
- call assert_equal(['Comment', 'Comment'], map(synstack(line("."), col(".")), 'synIDattr(synIDtrans(v:val), "name")'))
+ call assert_equal(['Comment', 'Comment'], map(synstack(line("."), col(".")), 'synIDattr(synIDtrans(v:val), "name")'))
norm fA
call assert_equal(['cComment'], map(synstack(line("."), col(".")), 'synIDattr(v:val, "name")'))
diff --git a/src/testdir/test_tabpage.vim b/src/testdir/test_tabpage.vim
index 48ac6eb2f..2eae3deb5 100644
--- a/src/testdir/test_tabpage.vim
+++ b/src/testdir/test_tabpage.vim
@@ -140,9 +140,6 @@ endfunc
" Test autocommands
function Test_tabpage_with_autocmd()
- if !has('autocmd')
- return
- endif
command -nargs=1 -bar C :call add(s:li, '=== ' . <q-args> . ' ===')|<args>
augroup TestTabpageGroup
au!
diff --git a/src/testdir/test_vartabs.vim b/src/testdir/test_vartabs.vim
index 0d14aad7f..df61c0ea6 100644
--- a/src/testdir/test_vartabs.vim
+++ b/src/testdir/test_vartabs.vim
@@ -5,6 +5,7 @@ if !has("vartabs")
endif
source view_util.vim
+
func s:compare_lines(expect, actual)
call assert_equal(join(a:expect, "\n"), join(a:actual, "\n"))
endfunc
@@ -372,3 +373,9 @@ func Test_vartabs_failures()
call assert_fails('set vts=,8')
call assert_fails('set vsts=,8')
endfunc
+
+func Test_vartabs_reset()
+ set vts=8
+ set all&
+ call assert_equal('', &vts)
+endfunc
diff --git a/src/version.c b/src/version.c
index 2448efd43..e6de24bca 100644
--- a/src/version.c
+++ b/src/version.c
@@ -772,6 +772,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 1193,
+/**/
1192,
/**/
1191,