Merge pull request #1732 from shirohana/fix/integrate-with-ctrlspace

airline#extension#ctrlspace: Fix tabline didn't update when enable both buffers and tabs
This commit is contained in:
Christian Brabandt 2018-06-05 11:23:12 +02:00 committed by GitHub
commit 6a05b92716
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -4,6 +4,7 @@
scriptencoding utf-8 scriptencoding utf-8
let s:current_bufnr = -1 let s:current_bufnr = -1
let s:current_modified = 0
let s:current_tabnr = -1 let s:current_tabnr = -1
let s:current_tabline = '' let s:current_tabline = ''
let s:highlight_groups = ['hid', 0, '', 'sel', 'mod_unsel', 0, 'mod_unsel', 'mod'] let s:highlight_groups = ['hid', 0, '', 'sel', 'mod_unsel', 0, 'mod_unsel', 'mod']
@ -39,6 +40,8 @@ function! airline#extensions#tabline#ctrlspace#add_buffer_section(builder, cur_t
return 0 return 0
endif endif
let s:current_modified = getbufvar(a:cur_buf, '&modified')
for buffer in buffer_list for buffer in buffer_list
let group = 'airline_tab' let group = 'airline_tab'
\ .s:highlight_groups[(4 * buffer.modified) + (2 * buffer.visible) + (a:cur_buf == buffer.index)] \ .s:highlight_groups[(4 * buffer.modified) + (2 * buffer.visible) + (a:cur_buf == buffer.index)]
@ -52,6 +55,7 @@ function! airline#extensions#tabline#ctrlspace#add_buffer_section(builder, cur_t
call a:builder.add_section_spaced(group, buf_name) call a:builder.add_section_spaced(group, buf_name)
endfor endfor
" add by tenfy(tenfyzhong@qq.com) " add by tenfy(tenfyzhong@qq.com)
" if the selected buffer was updated " if the selected buffer was updated
" return true " return true
@ -84,7 +88,9 @@ function! airline#extensions#tabline#ctrlspace#get()
let cur_tab = tabpagenr() let cur_tab = tabpagenr()
if cur_buf == s:current_bufnr && cur_tab == s:current_tabnr if cur_buf == s:current_bufnr && cur_tab == s:current_tabnr
return s:current_tabline if !g:airline_detect_modified || getbufvar(cur_buf, '&modified') == s:current_modified
return s:current_tabline
endif
endif endif
let builder = airline#extensions#tabline#new_builder() let builder = airline#extensions#tabline#new_builder()