Mercurial > vim
diff src/testdir/test_gui.vim @ 18031:8a2fb21c23c0 v8.1.2011
patch 8.1.2011: more functions can be used as methods
Commit: https://github.com/vim/vim/commit/ce90e36f5969e733a0a919f1736453332c33aad6
Author: Bram Moolenaar <Bram@vim.org>
Date: Sun Sep 8 18:58:44 2019 +0200
patch 8.1.2011: more functions can be used as methods
Problem: More functions can be used as methods.
Solution: Make various functions usable as a method. Make the window
command test faster.
author | Bram Moolenaar <Bram@vim.org> |
---|---|
date | Sun, 08 Sep 2019 19:00:04 +0200 |
parents | 131f1d8c5860 |
children | 5ae41d0ea397 |
line wrap: on
line diff
--- a/src/testdir/test_gui.vim +++ b/src/testdir/test_gui.vim @@ -398,71 +398,68 @@ func Test_set_guifont() endfunc func Test_set_guifontset() + CheckFeature xfontset let skipped = '' - if !has('xfontset') - let skipped = g:not_supported . 'xfontset' - else - let ctype_saved = v:ctype + let ctype_saved = v:ctype + + " First, since XCreateFontSet(3) is very sensitive to locale, fonts must + " be chosen meticulously. + let font_head = '-misc-fixed-medium-r-normal--14' - " First, since XCreateFontSet(3) is very sensitive to locale, fonts must - " be chosen meticulously. - let font_head = '-misc-fixed-medium-r-normal--14' + let font_aw70 = font_head . '-130-75-75-c-70' + let font_aw140 = font_head . '-130-75-75-c-140' - let font_aw70 = font_head . '-130-75-75-c-70' - let font_aw140 = font_head . '-130-75-75-c-140' + let font_jisx0201 = font_aw70 . '-jisx0201.1976-0' + let font_jisx0208 = font_aw140 . '-jisx0208.1983-0' - let font_jisx0201 = font_aw70 . '-jisx0201.1976-0' - let font_jisx0208 = font_aw140 . '-jisx0208.1983-0' - - let full_XLFDs = join([ font_jisx0208, font_jisx0201 ], ',') - let short_XLFDs = join([ font_aw140, font_aw70 ], ',') - let singleton = font_head . '-*' - let aliases = 'k14,r14' + let full_XLFDs = join([ font_jisx0208, font_jisx0201 ], ',') + let short_XLFDs = join([ font_aw140, font_aw70 ], ',') + let singleton = font_head . '-*' + let aliases = 'k14,r14' - " Second, among 'locales', look up such a locale that gets 'set - " guifontset=' to work successfully with every fontset specified with - " 'fontsets'. - let locales = [ 'ja_JP.UTF-8', 'ja_JP.eucJP', 'ja_JP.SJIS' ] - let fontsets = [ full_XLFDs, short_XLFDs, singleton, aliases ] + " Second, among 'locales', look up such a locale that gets 'set + " guifontset=' to work successfully with every fontset specified with + " 'fontsets'. + let locales = [ 'ja_JP.UTF-8', 'ja_JP.eucJP', 'ja_JP.SJIS' ] + let fontsets = [ full_XLFDs, short_XLFDs, singleton, aliases ] - let feasible = 0 - for locale in locales + let feasible = 0 + for locale in locales + try + exec 'language ctype' locale + catch /^Vim\%((\a\+)\)\=:E197/ + continue + endtry + let done = 0 + for fontset in fontsets try - exec 'language ctype' locale - catch /^Vim\%((\a\+)\)\=:E197/ - continue + exec 'set guifontset=' . fontset + catch /^Vim\%((\a\+)\)\=:E\%(250\|252\|234\|597\|598\)/ + break endtry - let done = 0 - for fontset in fontsets - try - exec 'set guifontset=' . fontset - catch /^Vim\%((\a\+)\)\=:E\%(250\|252\|234\|597\|598\)/ - break - endtry - let done += 1 - endfor - if done == len(fontsets) - let feasible = 1 - break - endif + let done += 1 endfor + if done == len(fontsets) + let feasible = 1 + break + endif + endfor - " Third, give a set of tests if it is found feasible. - if !feasible - let skipped = g:not_hosted - else - " N.B. 'v:ctype' has already been set to an appropriate value in the - " previous loop. - for fontset in fontsets - exec 'set guifontset=' . fontset - call assert_equal(fontset, &guifontset) - endfor - endif + " Third, give a set of tests if it is found feasible. + if !feasible + let skipped = g:not_hosted + else + " N.B. 'v:ctype' has already been set to an appropriate value in the + " previous loop. + for fontset in fontsets + exec 'set guifontset=' . fontset + call assert_equal(fontset, &guifontset) + endfor + endif - " Finally, restore ctype. - exec 'language ctype' ctype_saved - endif + " Finally, restore ctype. + exec 'language ctype' ctype_saved if !empty(skipped) throw skipped @@ -677,7 +674,7 @@ func Test_scrollbars() set guioptions+=rlb " scroll to move line 11 at top, moves the cursor there - call test_scrollbar('left', 10, 0) + eval 10->test_scrollbar('left', 0) redraw call assert_equal(1, winline()) call assert_equal(11, line('.'))