vim/csapprox
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Skip "abort if high color set" logic for snapshots

Browse Source 
Before, snapshots wouldn't work right for high color schemes, since
CSApproxImpl aborted early when a high color was found.  If the user
wanted this, though, they wouldn't have called CSApproxSnapshot.  So,
skip this logic in that case.
This commit is contained in:
Matt Wozniski 2009-01-17 01:26:57 -05:00
parent f8019878d0
commit e5ebdd692f
1 changed files with 18 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
plugin/CSApprox.vim
View File

@ -688,19 +688,23 @@ function! s:CSApproxImpl()
" sure that no groups are set to a value above 256, unless the color they're
" set to can be set internally by vim (gotten by scraping
" color_numbers_{88,256} in syntax.c:do_highlight)
for hlid in hinums
let val = highlights[hlid]
if ( val.cterm.bg > 15
\ && index(s:presets_{&t_Co}, str2nr(val.cterm.bg)) < 0)
\ || ( val.cterm.fg > 15
\ && index(s:presets_{&t_Co}, str2nr(val.cterm.fg)) < 0)
" The value is set above 15, and wasn't set by vim.
if &verbose >= 2
echomsg 'CSApprox: Exiting - high color found for' val.name
"
" XXX: s:inhibit_hicolor_test allows this test to be skipped for snapshots
if !exists("s:inhibit_hicolor_test") || !s:inhibit_hicolor_test
for hlid in hinums
let val = highlights[hlid]
if ( val.cterm.bg > 15
\ && index(s:presets_{&t_Co}, str2nr(val.cterm.bg)) < 0)
\ || ( val.cterm.fg > 15
\ && index(s:presets_{&t_Co}, str2nr(val.cterm.fg)) < 0)
" The value is set above 15, and wasn't set by vim.
if &verbose >= 2
echomsg 'CSApprox: Exiting - high color found for' val.name
endif
return
endif
return
endif
endfor
endfor
endif
call s:FixupGuiInfo(highlights)
call s:FixupCtermInfo(highlights)
@ -747,6 +751,7 @@ function! s:CSApproxSnapshot(file, overwrite)
endif
let save_t_Co = &t_Co
let s:inhibit_hicolor_test = 1
try
let lines = []
@ -788,6 +793,7 @@ function! s:CSApproxSnapshot(file, overwrite)
call writefile(lines, file)
finally
let &t_Co = save_t_Co
unlet s:inhibit_hicolor_test
endtry
endfunction