diff options
author | Bram Moolenaar <Bram@vim.org> | 2019-06-15 18:40:37 +0200 |
---|---|---|
committer | Bram Moolenaar <Bram@vim.org> | 2019-06-15 18:40:37 +0200 |
commit | 0331faf71200a274377e1569fcda4f00c9cf3e2a (patch) | |
tree | 2edf3171c224b62738e75352fe430b85733b664b /src | |
parent | 45aa07d3c126e887c614f8a4ebdb88aed673a9f1 (diff) | |
download | vim-git-0331faf71200a274377e1569fcda4f00c9cf3e2a.tar.gz |
patch 8.1.1546: in some tests 'tags' is set but not restoredv8.1.1546
Problem: In some tests 'tags' is set but not restored. (Daniel Hahler)
Solution: Restore 'tags'. (closes #4535)
Diffstat (limited to 'src')
-rw-r--r-- | src/testdir/test_autocmd.vim | 1 | ||||
-rw-r--r-- | src/testdir/test_cmdline.vim | 1 | ||||
-rw-r--r-- | src/testdir/test_options.vim | 1 | ||||
-rw-r--r-- | src/testdir/test_tagcase.vim | 1 | ||||
-rw-r--r-- | src/testdir/test_tagjump.vim | 5 | ||||
-rw-r--r-- | src/testdir/test_taglist.vim | 4 | ||||
-rw-r--r-- | src/version.c | 2 |
7 files changed, 14 insertions, 1 deletions
diff --git a/src/testdir/test_autocmd.vim b/src/testdir/test_autocmd.vim index 3254db8cd..d762c9194 100644 --- a/src/testdir/test_autocmd.vim +++ b/src/testdir/test_autocmd.vim @@ -1100,6 +1100,7 @@ func Test_OptionSet() " Cleanup au! OptionSet + " set tags& for opt in ['nu', 'ai', 'acd', 'ar', 'bs', 'backup', 'cul', 'cp', 'backupext', 'tags', 'spelllang', 'statusline', 'foldignore', 'cmdheight', 'undolevels', 'wrapmargin', 'foldcolumn', 'wrapscan', 'autoread', 'cindent', 'cursorcolumn'] exe printf(":set %s&vim", opt) endfor diff --git a/src/testdir/test_cmdline.vim b/src/testdir/test_cmdline.vim index 3b275b617..f0d83c62d 100644 --- a/src/testdir/test_cmdline.vim +++ b/src/testdir/test_cmdline.vim @@ -378,6 +378,7 @@ func Test_getcompletion() endfor call delete('Xtags') + set tags& call assert_fails('call getcompletion("", "burp")', 'E475:') endfunc diff --git a/src/testdir/test_options.vim b/src/testdir/test_options.vim index 9d3065d15..e8eaef038 100644 --- a/src/testdir/test_options.vim +++ b/src/testdir/test_options.vim @@ -237,6 +237,7 @@ func Test_set_completion() call feedkeys(":set tags=./\\\\ dif\<C-A>\<C-B>\"\<CR>", 'tx') call assert_equal('"set tags=./\\ diff diffexpr diffopt', @:) + set tags& endfunc func Test_set_errors() diff --git a/src/testdir/test_tagcase.vim b/src/testdir/test_tagcase.vim index 83e532822..08782b3f1 100644 --- a/src/testdir/test_tagcase.vim +++ b/src/testdir/test_tagcase.vim @@ -44,6 +44,7 @@ func Test_tagcase() endfor call delete('Xtags') + set tags& set ic& setg tc& setl tc& diff --git a/src/testdir/test_tagjump.vim b/src/testdir/test_tagjump.vim index 7e64ac435..e4084b314 100644 --- a/src/testdir/test_tagjump.vim +++ b/src/testdir/test_tagjump.vim @@ -20,6 +20,7 @@ func Test_cancel_ptjump() call assert_equal(2, winnr('$')) call delete('Xtags') + set tags& quit endfunc @@ -104,6 +105,7 @@ func Test_tagjump_switchbuf() enew | only call delete('Xfile1') call delete('Xtags') + set tags& set switchbuf&vim endfunc @@ -431,7 +433,7 @@ func Test_tagnr_recall() tag call assert_equal(bufname('%'), 'Xtest.h') - set tag& + set tags& call delete('Xtags') bwipe Xtest.h bwipe Xtest.c @@ -467,6 +469,7 @@ func Test_tag_line_toolong() endtry call assert_equal('Ignoring long line in tags file', split(execute('messages'), '\n')[-1]) call delete('Xtags') + set tags& let &verbose = old_vbs endfunc diff --git a/src/testdir/test_taglist.vim b/src/testdir/test_taglist.vim index 6506c3f1d..9ddefc515 100644 --- a/src/testdir/test_taglist.vim +++ b/src/testdir/test_taglist.vim @@ -30,6 +30,7 @@ func Test_taglist() call assert_equal('call cursor(3, 4)', cmd[0]['cmd']) call delete('Xtags') + set tags& bwipe endfunc @@ -50,6 +51,7 @@ func Test_taglist_native_etags() \ map(taglist('set_signals'), {i, v -> [v.name, v.cmd]})) call delete('Xtags') + set tags& endfunc func Test_taglist_ctags_etags() @@ -69,6 +71,7 @@ func Test_taglist_ctags_etags() \ map(taglist('set_signals'), {i, v -> [v.name, v.cmd]})) call delete('Xtags') + set tags& endfunc func Test_tags_too_long() @@ -110,4 +113,5 @@ func Test_tagsfile_without_trailing_newline() call assert_equal('Foo', tl[0].name) call delete('Xtags') + set tags& endfunc diff --git a/src/version.c b/src/version.c index 51101f81c..675beb8f8 100644 --- a/src/version.c +++ b/src/version.c @@ -778,6 +778,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 1546, +/**/ 1545, /**/ 1544, |