From eadeee316c8ef97c9987f1be9f84ed714062b1b8 Mon Sep 17 00:00:00 2001 From: Bailey Ling Date: Wed, 28 Aug 2013 01:34:10 +0000 Subject: [PATCH] fixes a weird error after neobundle installs a new plugin. --- plugin/airline.vim | 196 ++++++++++++++++++++++----------------------- 1 file changed, 98 insertions(+), 98 deletions(-) diff --git a/plugin/airline.vim b/plugin/airline.vim index cd7ad60..0547d4d 100644 --- a/plugin/airline.vim +++ b/plugin/airline.vim @@ -14,71 +14,71 @@ function! s:check_defined(variable, default) endif 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_theme_defined = 0 function! s:init() if !s:airline_initialized 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 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)) @@ -127,47 +127,47 @@ function! s:airline_toggle() au! augroup END augroup! airline - if exists("s:stl") - let &stl = s:stl + if exists("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 on_window_changed() + autocmd CmdwinLeave * call airline#remove_statusline_func('airline#cmdwinenter') + + autocmd ColorScheme * call on_colorscheme_changed() + autocmd WinEnter,BufWinEnter,FileType,BufUnload,ShellCmdPost,VimResized * + \ call 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 on_window_changed() + endif endif - else - let s:stl = &stl - augroup airline - autocmd! + endfunction - autocmd CmdwinEnter * - \ call airline#add_statusline_func('airline#cmdwinenter') - \ | call on_window_changed() - autocmd CmdwinLeave * call airline#remove_statusline_func('airline#cmdwinenter') - - autocmd ColorScheme * call on_colorscheme_changed() - autocmd WinEnter,BufWinEnter,FileType,BufUnload,ShellCmdPost,VimResized * - \ call 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 on_window_changed() + function! s:get_airline_themes(a, l, p) + 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 - endif -endfunction + endfunction + command! -nargs=? -complete=customlist,get_airline_themes AirlineTheme call airline_theme() + command! AirlineToggleWhitespace call airline#extensions#whitespace#toggle() + command! AirlineToggle call airline_toggle() -function! s:get_airline_themes(a, l, p) - 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,get_airline_themes AirlineTheme call airline_theme() -command! AirlineToggleWhitespace call airline#extensions#whitespace#toggle() -command! AirlineToggle call airline_toggle() - -call airline_toggle() + call airline_toggle()