VimPlug/vim-airline
1
0
Fork 0
mirror of https://github.com/vim-airline/vim-airline.git synced 2026-02-21 00:58:26 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch '127'

Browse Source 
Resolves #127.

Conflicts:
	autoload/airline.vim
This commit is contained in:
bling
2013-08-10 12:15:14 -04:00
parent 8539ac46a6 61a39a99ac
commit e1ff1edcf0
14 changed files with 46 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
autoload/airline.vim
View File

@@ -32,7 +32,6 @@ endfunction
function! airline#reload_highlight()
call airline#highlight(['inactive'])
call airline#highlight(['normal'])
call airline#themes#exec_highlight_separator('Al2', 'warningmsg')
call airline#extensions#load_theme()
endfunction
@@ -56,6 +55,7 @@ function! airline#highlight(modes)
endfor
endif
endfor
call airline#themes#exec_highlight_separator('Al2', 'warningmsg')
endfunction
" for 7.2 compatibility
@@ -79,7 +79,7 @@ function! s:get_statusline(winnr, active)
let l:file_flag_color = a:active ? "%#Al7#" : "%#Al7_inactive#"
let sl = '%{airline#update_highlight()}'
if a:active || s:getwinvar(a:winnr, 'airline_left_only', 0)
if s:getwinvar(a:winnr, 'airline_render_left', a:active)
let sl.=l:mode_color.s:get_section(a:winnr, 'a')
let sl.='%{g:airline_detect_paste && &paste ? g:airline_paste_symbol." " : ""}'
let sl.=l:mode_sep_color
@@ -95,7 +95,7 @@ function! s:get_statusline(winnr, active)
else
let sl.=l:status_color.' %f%m'
endif
if !s:getwinvar(a:winnr, 'airline_left_only', 0)
if s:getwinvar(a:winnr, 'airline_render_right', 1)
let sl.='%='
let sl.=s:get_section(a:winnr, 'x')
let sl.=l:info_sep_color
@@ -146,7 +146,8 @@ function! airline#update_statusline()
let w:airline_active = 1
unlet! w:airline_left_only
unlet! w:airline_render_left
unlet! w:airline_render_right
for section in s:sections
unlet! w:airline_section_{section}
endfor