ylib/vim-airline
1
0
Fork 0
mirror of https://github.com/vim-airline/vim-airline.git synced 2025-02-17 07:02:48 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix missing check for w:airline_disable_statusline

Browse Source
This commit is contained in:
midchildan 2019-12-22 20:06:35 +09:00
parent b93492b40b
commit bc0e2a3438
No known key found for this signature in database
GPG Key ID: D9A5748BACC6E3C2
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
autoload/airline.vim
View File

@ -125,7 +125,7 @@ endfunction
" Update the statusline " Update the statusline
function! airline#update_statusline() function! airline#update_statusline()
if airline#util#stl_disabled() if airline#util#stl_disabled(winnr())
return return
endif endif
let range = filter(range(1, winnr('$')), 'v:val != winnr()') let range = filter(range(1, winnr('$')), 'v:val != winnr()')
@ -154,11 +154,11 @@ endfunction
" Function to draw inactive statuslines for inactive windows " Function to draw inactive statuslines for inactive windows
function! airline#update_statusline_inactive(range) function! airline#update_statusline_inactive(range)
if airline#util#stl_disabled() if airline#util#stl_disabled(winnr())
return return
endif endif
for nr in a:range for nr in a:range
if airline#util#getwinvar(nr, 'airline_disabled', 0) if airline#util#stl_disabled(nr)
continue continue
endif endif
call setwinvar(nr, 'airline_active', 0) call setwinvar(nr, 'airline_active', 0)

6
autoload/airline/util.vim
View File

@ -170,11 +170,11 @@ function! airline#util#themes(match)
return sort(map(files, 'fnamemodify(v:val, ":t:r")') + ['random']) return sort(map(files, 'fnamemodify(v:val, ":t:r")') + ['random'])
endfunction endfunction
function! airline#util#stl_disabled() function! airline#util#stl_disabled(winnr)
" setting the statusline is disabled, " setting the statusline is disabled,
" either globally or per window " either globally or per window
" w:airline_disabled is deprecated! " w:airline_disabled is deprecated!
return get(g:, 'airline_disable_statusline', 0) || return get(g:, 'airline_disable_statusline', 0) ||
\ airline#util#getwinvar(winnr(), 'airline_disable_statusline', 0) || \ airline#util#getwinvar(a:winnr, 'airline_disable_statusline', 0) ||
\ airline#util#getwinvar(winnr(), 'airline_disabled', 0) \ airline#util#getwinvar(a:winnr, 'airline_disabled', 0)
endfunction endfunction

2
plugin/airline.vim
View File

@ -181,7 +181,7 @@ function! s:airline_toggle()
endif endif
augroup END augroup END
if !airline#util#stl_disabled() if !airline#util#stl_disabled(winnr())
if &laststatus < 2 if &laststatus < 2
set laststatus=2 set laststatus=2
endif endif