mirror of
https://github.com/vim-airline/vim-airline.git
synced 2025-07-26 15:34:32 +02:00
fixes a weird error after neobundle installs a new plugin.
This commit is contained in:
Bailey Ling
parent
14656f766b
commit
eadeee316c
@ -14,71 +14,71 @@ function! s:check_defined(variable, default)
|
|||||||
endif
|
endif
|
||||||
endfunction
|
endfunction
|
||||||
|
|
||||||
call s:check_defined('g:airline_left_sep', get(g:, 'airline_powerline_fonts', 0)?"":">")
|
|
||||||
call s:check_defined('g:airline_left_alt_sep', get(g:, 'airline_powerline_fonts', 0)?"":">")
|
|
||||||
call s:check_defined('g:airline_right_sep', get(g:, 'airline_powerline_fonts', 0)?"":"<")
|
|
||||||
call s:check_defined('g:airline_right_alt_sep', get(g:, 'airline_powerline_fonts', 0)?"":"<")
|
|
||||||
call s:check_defined('g:airline_detect_modified', 1)
|
|
||||||
call s:check_defined('g:airline_detect_paste', 1)
|
|
||||||
call s:check_defined('g:airline_detect_iminsert', 0)
|
|
||||||
call s:check_defined('g:airline_inactive_collapse', 1)
|
|
||||||
call s:check_defined('g:airline_exclude_filenames', ['DebuggerWatch','DebuggerStack','DebuggerStatus'])
|
|
||||||
call s:check_defined('g:airline_exclude_filetypes', [])
|
|
||||||
call s:check_defined('g:airline_exclude_preview', 0)
|
|
||||||
|
|
||||||
call s:check_defined('g:airline_symbols', {})
|
|
||||||
call extend(g:airline_symbols, {
|
|
||||||
\ 'paste': get(g:, 'airline_paste_symbol', g:airline_left_alt_sep.' PASTE'),
|
|
||||||
\ 'readonly': get(g:, 'airline_readonly_symbol', get(g:, 'airline_powerline_fonts', 0) ? '' : 'RO'),
|
|
||||||
\ 'whitespace': get(g:, 'airline_powerline_fonts', 0) ? '✹' : '!',
|
|
||||||
\ 'linenr': get(g:, 'airline_linecolumn_prefix', get(g:, 'airline_powerline_fonts', 0) ? '' : ':' ),
|
|
||||||
\ 'branch': get(g:, 'airline_branch_prefix', get(g:, 'airline_powerline_fonts', 0) ? '' : ''),
|
|
||||||
\ }, 'keep')
|
|
||||||
|
|
||||||
call s:check_defined('g:airline_parts', {})
|
|
||||||
call extend(g:airline_parts, {
|
|
||||||
\ 'mode': '%{get(w:,"airline_current_mode","")}',
|
|
||||||
\ 'iminsert': '%{airline#parts#iminsert()}',
|
|
||||||
\ 'paste': '%{airline#parts#paste()}',
|
|
||||||
\ 'readonly': '%#airline_file#%{airline#parts#readonly()}',
|
|
||||||
\ 'ffenc': '%{printf("%s%s",&fenc,strlen(&ff)>0?"[".&ff."]":"")}',
|
|
||||||
\ 'file': '%f%m',
|
|
||||||
\ 'hunks': '',
|
|
||||||
\ 'branch': '',
|
|
||||||
\ 'tagbar': '',
|
|
||||||
\ 'syntastic': '',
|
|
||||||
\ 'whitespace': '',
|
|
||||||
\ }, 'keep')
|
|
||||||
|
|
||||||
call s:check_defined('g:airline_mode_map', {})
|
|
||||||
call extend(g:airline_mode_map, {
|
|
||||||
\ '__' : '------',
|
|
||||||
\ 'n' : 'NORMAL',
|
|
||||||
\ 'i' : 'INSERT',
|
|
||||||
\ 'R' : 'REPLACE',
|
|
||||||
\ 'v' : 'VISUAL',
|
|
||||||
\ 'V' : 'V-LINE',
|
|
||||||
\ 'c' : 'COMMAND',
|
|
||||||
\ '' : 'V-BLOCK',
|
|
||||||
\ 's' : 'SELECT',
|
|
||||||
\ 'S' : 'S-LINE',
|
|
||||||
\ '' : 'S-BLOCK',
|
|
||||||
\ }, 'keep')
|
|
||||||
|
|
||||||
call s:check_defined('g:airline_theme_map', {})
|
|
||||||
call extend(g:airline_theme_map, {
|
|
||||||
\ 'Tomorrow.*': 'tomorrow',
|
|
||||||
\ 'mo[l|n]okai': 'molokai',
|
|
||||||
\ 'wombat.*': 'wombat',
|
|
||||||
\ '.*solarized.*': 'solarized',
|
|
||||||
\ }, 'keep')
|
|
||||||
|
|
||||||
let s:airline_initialized = 0
|
let s:airline_initialized = 0
|
||||||
let s:airline_theme_defined = 0
|
let s:airline_theme_defined = 0
|
||||||
function! s:init()
|
function! s:init()
|
||||||
if !s:airline_initialized
|
if !s:airline_initialized
|
||||||
let s:airline_initialized = 1
|
let s:airline_initialized = 1
|
||||||
|
|
||||||
|
call s:check_defined('g:airline_left_sep', get(g:, 'airline_powerline_fonts', 0)?"":">")
|
||||||
|
call s:check_defined('g:airline_left_alt_sep', get(g:, 'airline_powerline_fonts', 0)?"":">")
|
||||||
|
call s:check_defined('g:airline_right_sep', get(g:, 'airline_powerline_fonts', 0)?"":"<")
|
||||||
|
call s:check_defined('g:airline_right_alt_sep', get(g:, 'airline_powerline_fonts', 0)?"":"<")
|
||||||
|
call s:check_defined('g:airline_detect_modified', 1)
|
||||||
|
call s:check_defined('g:airline_detect_paste', 1)
|
||||||
|
call s:check_defined('g:airline_detect_iminsert', 0)
|
||||||
|
call s:check_defined('g:airline_inactive_collapse', 1)
|
||||||
|
call s:check_defined('g:airline_exclude_filenames', ['DebuggerWatch','DebuggerStack','DebuggerStatus'])
|
||||||
|
call s:check_defined('g:airline_exclude_filetypes', [])
|
||||||
|
call s:check_defined('g:airline_exclude_preview', 0)
|
||||||
|
|
||||||
|
call s:check_defined('g:airline_symbols', {})
|
||||||
|
call extend(g:airline_symbols, {
|
||||||
|
\ 'paste': get(g:, 'airline_paste_symbol', g:airline_left_alt_sep.' PASTE'),
|
||||||
|
\ 'readonly': get(g:, 'airline_readonly_symbol', get(g:, 'airline_powerline_fonts', 0) ? '' : 'RO'),
|
||||||
|
\ 'whitespace': get(g:, 'airline_powerline_fonts', 0) ? '✹' : '!',
|
||||||
|
\ 'linenr': get(g:, 'airline_linecolumn_prefix', get(g:, 'airline_powerline_fonts', 0) ? '' : ':' ),
|
||||||
|
\ 'branch': get(g:, 'airline_branch_prefix', get(g:, 'airline_powerline_fonts', 0) ? '' : ''),
|
||||||
|
\ }, 'keep')
|
||||||
|
|
||||||
|
call s:check_defined('g:airline_parts', {})
|
||||||
|
call extend(g:airline_parts, {
|
||||||
|
\ 'mode': '%{get(w:,"airline_current_mode","")}',
|
||||||
|
\ 'iminsert': '%{airline#parts#iminsert()}',
|
||||||
|
\ 'paste': '%{airline#parts#paste()}',
|
||||||
|
\ 'readonly': '%#airline_file#%{airline#parts#readonly()}',
|
||||||
|
\ 'ffenc': '%{printf("%s%s",&fenc,strlen(&ff)>0?"[".&ff."]":"")}',
|
||||||
|
\ 'file': '%f%m',
|
||||||
|
\ 'hunks': '',
|
||||||
|
\ 'branch': '',
|
||||||
|
\ 'tagbar': '',
|
||||||
|
\ 'syntastic': '',
|
||||||
|
\ 'whitespace': '',
|
||||||
|
\ }, 'keep')
|
||||||
|
|
||||||
|
call s:check_defined('g:airline_mode_map', {})
|
||||||
|
call extend(g:airline_mode_map, {
|
||||||
|
\ '__' : '------',
|
||||||
|
\ 'n' : 'NORMAL',
|
||||||
|
\ 'i' : 'INSERT',
|
||||||
|
\ 'R' : 'REPLACE',
|
||||||
|
\ 'v' : 'VISUAL',
|
||||||
|
\ 'V' : 'V-LINE',
|
||||||
|
\ 'c' : 'COMMAND',
|
||||||
|
\ '' : 'V-BLOCK',
|
||||||
|
\ 's' : 'SELECT',
|
||||||
|
\ 'S' : 'S-LINE',
|
||||||
|
\ '' : 'S-BLOCK',
|
||||||
|
\ }, 'keep')
|
||||||
|
|
||||||
|
call s:check_defined('g:airline_theme_map', {})
|
||||||
|
call extend(g:airline_theme_map, {
|
||||||
|
\ 'Tomorrow.*': 'tomorrow',
|
||||||
|
\ 'mo[l|n]okai': 'molokai',
|
||||||
|
\ 'wombat.*': 'wombat',
|
||||||
|
\ '.*solarized.*': 'solarized',
|
||||||
|
\ }, 'keep')
|
||||||
|
|
||||||
call airline#extensions#load()
|
call airline#extensions#load()
|
||||||
call s:check_defined('g:airline_section_a', (g:airline_parts.mode).(g:airline_parts.paste).(g:airline_parts.iminsert))
|
call s:check_defined('g:airline_section_a', (g:airline_parts.mode).(g:airline_parts.paste).(g:airline_parts.iminsert))
|
||||||
call s:check_defined('g:airline_section_b', (g:airline_parts.hunks).(g:airline_parts.branch))
|
call s:check_defined('g:airline_section_b', (g:airline_parts.hunks).(g:airline_parts.branch))
|
||||||
@ -127,47 +127,47 @@ function! s:airline_toggle()
|
|||||||
au!
|
au!
|
||||||
augroup END
|
augroup END
|
||||||
augroup! airline
|
augroup! airline
|
||||||
if exists("s:stl")
|
if exists("s:stl")
|
||||||
let &stl = s:stl
|
let &stl = s:stl
|
||||||
|
endif
|
||||||
|
else
|
||||||
|
let s:stl = &stl
|
||||||
|
augroup airline
|
||||||
|
autocmd!
|
||||||
|
|
||||||
|
autocmd CmdwinEnter *
|
||||||
|
\ call airline#add_statusline_func('airline#cmdwinenter')
|
||||||
|
\ | call <sid>on_window_changed()
|
||||||
|
autocmd CmdwinLeave * call airline#remove_statusline_func('airline#cmdwinenter')
|
||||||
|
|
||||||
|
autocmd ColorScheme * call <sid>on_colorscheme_changed()
|
||||||
|
autocmd WinEnter,BufWinEnter,FileType,BufUnload,ShellCmdPost,VimResized *
|
||||||
|
\ call <sid>on_window_changed()
|
||||||
|
|
||||||
|
autocmd BufWritePost */autoload/airline/themes/*.vim
|
||||||
|
\ exec 'source '.split(globpath(&rtp, 'autoload/airline/themes/'.g:airline_theme.'.vim', 1), "\n")[0]
|
||||||
|
\ | call airline#load_theme()
|
||||||
|
augroup END
|
||||||
|
if s:airline_initialized
|
||||||
|
call <sid>on_window_changed()
|
||||||
|
endif
|
||||||
endif
|
endif
|
||||||
else
|
endfunction
|
||||||
let s:stl = &stl
|
|
||||||
augroup airline
|
|
||||||
autocmd!
|
|
||||||
|
|
||||||
autocmd CmdwinEnter *
|
function! s:get_airline_themes(a, l, p)
|
||||||
\ call airline#add_statusline_func('airline#cmdwinenter')
|
let files = split(globpath(&rtp, 'autoload/airline/themes/'.a:a.'*'), "\n")
|
||||||
\ | call <sid>on_window_changed()
|
return map(files, 'fnamemodify(v:val, ":t:r")')
|
||||||
autocmd CmdwinLeave * call airline#remove_statusline_func('airline#cmdwinenter')
|
endfunction
|
||||||
|
function! s:airline_theme(...)
|
||||||
autocmd ColorScheme * call <sid>on_colorscheme_changed()
|
if a:0
|
||||||
autocmd WinEnter,BufWinEnter,FileType,BufUnload,ShellCmdPost,VimResized *
|
call airline#switch_theme(a:1)
|
||||||
\ call <sid>on_window_changed()
|
else
|
||||||
|
echo g:airline_theme
|
||||||
autocmd BufWritePost */autoload/airline/themes/*.vim
|
|
||||||
\ exec 'source '.split(globpath(&rtp, 'autoload/airline/themes/'.g:airline_theme.'.vim', 1), "\n")[0]
|
|
||||||
\ | call airline#load_theme()
|
|
||||||
augroup END
|
|
||||||
if s:airline_initialized
|
|
||||||
call <sid>on_window_changed()
|
|
||||||
endif
|
endif
|
||||||
endif
|
endfunction
|
||||||
endfunction
|
command! -nargs=? -complete=customlist,<sid>get_airline_themes AirlineTheme call <sid>airline_theme(<f-args>)
|
||||||
|
command! AirlineToggleWhitespace call airline#extensions#whitespace#toggle()
|
||||||
|
command! AirlineToggle call <sid>airline_toggle()
|
||||||
|
|
||||||
function! s:get_airline_themes(a, l, p)
|
call <sid>airline_toggle()
|
||||||
let files = split(globpath(&rtp, 'autoload/airline/themes/'.a:a.'*'), "\n")
|
|
||||||
return map(files, 'fnamemodify(v:val, ":t:r")')
|
|
||||||
endfunction
|
|
||||||
function! s:airline_theme(...)
|
|
||||||
if a:0
|
|
||||||
call airline#switch_theme(a:1)
|
|
||||||
else
|
|
||||||
echo g:airline_theme
|
|
||||||
endif
|
|
||||||
endfunction
|
|
||||||
command! -nargs=? -complete=customlist,<sid>get_airline_themes AirlineTheme call <sid>airline_theme(<f-args>)
|
|
||||||
command! AirlineToggleWhitespace call airline#extensions#whitespace#toggle()
|
|
||||||
command! AirlineToggle call <sid>airline_toggle()
|
|
||||||
|
|
||||||
call <sid>airline_toggle()
|
|
||||||
|
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user