From e9196637811884719b051b7249bd61826f0329fe Mon Sep 17 00:00:00 2001 From: Bailey Ling Date: Mon, 26 Aug 2013 22:55:11 -0400 Subject: [PATCH 1/6] always enable paste detection. --- README.md | 2 +- autoload/airline/extensions.vim | 4 ---- autoload/airline/extensions/paste.vim | 14 -------------- autoload/airline/fragments.vim | 12 ++++++++++++ doc/airline.txt | 9 +++------ plugin/airline.vim | 2 +- 6 files changed, 17 insertions(+), 26 deletions(-) delete mode 100644 autoload/airline/extensions/paste.vim create mode 100644 autoload/airline/fragments.vim diff --git a/README.md b/README.md index d3d50614..1d60c69b 100644 --- a/README.md +++ b/README.md @@ -15,7 +15,7 @@ Lean & mean statusline for vim that's light as air. # Straightforward customization -If you don't like the defaults, you can replace all sections with standard `statusline` syntax. +If you don't like the defaults, you can replace all sections with standard `statusline` syntax. Give your statusline that you've built over the years a face lift. ![image](https://f.cloud.github.com/assets/306502/1009429/d69306da-0b38-11e3-94bf-7c6e3eef41e9.png) diff --git a/autoload/airline/extensions.vim b/autoload/airline/extensions.vim index 7dce3d4a..7aa6c172 100644 --- a/autoload/airline/extensions.vim +++ b/autoload/airline/extensions.vim @@ -199,10 +199,6 @@ function! airline#extensions#load() call airline#extensions#readonly#init() endif - if (get(g:, 'airline#extensions#paste#enabled', 1) && get(g:, 'airline_detect_paste', 1)) - call airline#extensions#paste#init() - endif - if get(g:, 'airline#extensions#iminsert#enabled', 0) || get(g:, 'airline_detect_iminsert', 0) call airline#extensions#iminsert#init() endif diff --git a/autoload/airline/extensions/paste.vim b/autoload/airline/extensions/paste.vim deleted file mode 100644 index 9f948357..00000000 --- a/autoload/airline/extensions/paste.vim +++ /dev/null @@ -1,14 +0,0 @@ -" MIT License. Copyright (c) 2013 Bailey Ling. -" vim: et ts=2 sts=2 sw=2 - -let s:symbol = get(g:, 'airline#extensions#paste#symbol', - \ get(g:, 'airline_paste_symbol', (get(g:, 'airline_powerline_fonts', 0) ? ' ' : '').'PASTE')) - -function! airline#extensions#paste#get_mark() - return &paste ? ' ' . s:symbol : '' -endfunction - -function! airline#extensions#paste#init() - let g:airline_section_a .= '%{airline#extensions#paste#get_mark()}' -endfunction - diff --git a/autoload/airline/fragments.vim b/autoload/airline/fragments.vim new file mode 100644 index 00000000..89f07972 --- /dev/null +++ b/autoload/airline/fragments.vim @@ -0,0 +1,12 @@ +" MIT License. Copyright (c) 2013 Bailey Ling. +" vim: et ts=2 sts=2 sw=2 + +let g:airline#fragments#symbols = get(g:, 'airline#fragments#symbols', {}) +call extend(g:airline#fragments#symbols, { + \ 'paste': get(g:, 'airline_paste_symbol', g:airline_left_alt_sep.' PASTE') + \ }, 'keep') + +function! airline#fragments#get_paste() + return &paste ? ' ' . g:airline#fragments#symbols.paste : '' +endfunction + diff --git a/doc/airline.txt b/doc/airline.txt index ed8d696b..900a7785 100644 --- a/doc/airline.txt +++ b/doc/airline.txt @@ -46,9 +46,6 @@ values): * enable modified detection > let g:airline_detect_modified=1 -* enable paste detection > - let g:airline_detect_paste=1 -< * enable iminsert detection > let g:airline_detect_iminsert=1 < @@ -132,9 +129,9 @@ separators, as well as the powerline font glyths. let g:airline_linecolumn_prefix = '␤ ' let g:airline_linecolumn_prefix = '¶ ' let g:airline#extensions#branch#symbol = '⎇ ' - let g:airline#extensions#paste#symbol = 'ρ' - let g:airline#extensions#paste#symbol = 'Þ' - let g:airline#extensions#paste#symbol = '∥' + let g:airline#fragments#symbols.paste = 'ρ' + let g:airline#fragments#symbols.paste = 'Þ' + let g:airline#fragments#symbols.paste = '∥' let g:airline#extensions#whitespace#symbol = 'Ξ' " powerline symbols diff --git a/plugin/airline.vim b/plugin/airline.vim index 6c37b213..f75107bc 100644 --- a/plugin/airline.vim +++ b/plugin/airline.vim @@ -49,7 +49,7 @@ call s:check_defined('g:airline_theme_map', { \ '.*solarized.*': 'solarized', \ }) -call s:check_defined('g:airline_section_a', '%{get(w:, "airline_current_mode", "")}') +call s:check_defined('g:airline_section_a', '%{get(w:, "airline_current_mode", "")}%{airline#fragments#get_paste()}') call s:check_defined('g:airline_section_b', '') call s:check_defined('g:airline_section_c', '%f%m') call s:check_defined('g:airline_section_gutter', '%=') From fe24924ad3998190729d4d1f6c0380c31091e1ce Mon Sep 17 00:00:00 2001 From: Bailey Ling Date: Mon, 26 Aug 2013 23:07:14 -0400 Subject: [PATCH 2/6] convert iminsert into a fragment. --- autoload/airline/extensions.vim | 4 ---- autoload/airline/extensions/iminsert.vim | 14 -------------- autoload/airline/fragments.vim | 9 ++++++++- doc/airline.txt | 5 ++++- plugin/airline.vim | 3 ++- 5 files changed, 14 insertions(+), 21 deletions(-) delete mode 100644 autoload/airline/extensions/iminsert.vim diff --git a/autoload/airline/extensions.vim b/autoload/airline/extensions.vim index 7aa6c172..1ad7d92a 100644 --- a/autoload/airline/extensions.vim +++ b/autoload/airline/extensions.vim @@ -199,10 +199,6 @@ function! airline#extensions#load() call airline#extensions#readonly#init() endif - if get(g:, 'airline#extensions#iminsert#enabled', 0) || get(g:, 'airline_detect_iminsert', 0) - call airline#extensions#iminsert#init() - endif - " load all other extensions not part of the default distribution for file in split(globpath(&rtp, "autoload/airline/extensions/*.vim"), "\n") " check to see that both the resolved and unresolved paths do not match diff --git a/autoload/airline/extensions/iminsert.vim b/autoload/airline/extensions/iminsert.vim deleted file mode 100644 index 9371016a..00000000 --- a/autoload/airline/extensions/iminsert.vim +++ /dev/null @@ -1,14 +0,0 @@ -" MIT License. Copyright (c) 2013 Bailey Ling. -" vim: et ts=2 sts=2 sw=2 - -function! airline#extensions#iminsert#get_text() - if &iminsert - return toupper(get(b:, 'keymap_name', 'lang')) - endif - return '' -endfunction - -function! airline#extensions#iminsert#init() - let g:airline_section_a .= ' '.g:airline_left_alt_sep.' %{airline#extensions#iminsert#get_text()}' -endfunction - diff --git a/autoload/airline/fragments.vim b/autoload/airline/fragments.vim index 89f07972..aa25f9f6 100644 --- a/autoload/airline/fragments.vim +++ b/autoload/airline/fragments.vim @@ -7,6 +7,13 @@ call extend(g:airline#fragments#symbols, { \ }, 'keep') function! airline#fragments#get_paste() - return &paste ? ' ' . g:airline#fragments#symbols.paste : '' + return g:airline_detect_paste && &paste ? ' '.g:airline#fragments#symbols.paste : '' +endfunction + +function! airline#fragments#get_iminsert() + if g:airline_detect_iminsert && &iminsert && exists('b:keymap_name') + return ' '.g:airline_left_alt_sep.' '.toupper(b:keymap_name) + endif + return '' endfunction diff --git a/doc/airline.txt b/doc/airline.txt index 900a7785..93f7a116 100644 --- a/doc/airline.txt +++ b/doc/airline.txt @@ -46,8 +46,11 @@ values): * enable modified detection > let g:airline_detect_modified=1 +* enable paste detection > + let g:airline_detect_paste=1 +< * enable iminsert detection > - let g:airline_detect_iminsert=1 + let g:airline_detect_iminsert=0 < * determine whether inactive windows should have the left section collapsed to only the filename of that buffer. > diff --git a/plugin/airline.vim b/plugin/airline.vim index f75107bc..0329aaa7 100644 --- a/plugin/airline.vim +++ b/plugin/airline.vim @@ -22,6 +22,7 @@ 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_linecolumn_prefix', get(g:, 'airline_powerline_fonts', 0)?' ':':') call s:check_defined('g:airline_inactive_collapse', 1) call s:check_defined('g:airline_exclude_filenames', ['DebuggerWatch','DebuggerStack','DebuggerStatus']) @@ -49,7 +50,7 @@ call s:check_defined('g:airline_theme_map', { \ '.*solarized.*': 'solarized', \ }) -call s:check_defined('g:airline_section_a', '%{get(w:, "airline_current_mode", "")}%{airline#fragments#get_paste()}') +call s:check_defined('g:airline_section_a', '%{get(w:, "airline_current_mode", "")}%{airline#fragments#get_paste()}%{airline#fragments#get_iminsert()}') call s:check_defined('g:airline_section_b', '') call s:check_defined('g:airline_section_c', '%f%m') call s:check_defined('g:airline_section_gutter', '%=') From 6dd4cd5423f7318f022c9931b96b0b3e08dfa4a4 Mon Sep 17 00:00:00 2001 From: Bailey Ling Date: Mon, 26 Aug 2013 23:34:02 -0400 Subject: [PATCH 3/6] clean up how symbols are defined. --- autoload/airline/extensions.vim | 4 --- autoload/airline/extensions/branch.vim | 5 ++-- autoload/airline/extensions/readonly.vim | 15 ----------- autoload/airline/extensions/whitespace.vim | 4 +-- autoload/airline/fragments.vim | 11 ++++---- doc/airline.txt | 31 ++++++++++------------ plugin/airline.vim | 16 ++++++++--- 7 files changed, 34 insertions(+), 52 deletions(-) delete mode 100644 autoload/airline/extensions/readonly.vim diff --git a/autoload/airline/extensions.vim b/autoload/airline/extensions.vim index 1ad7d92a..4aac225c 100644 --- a/autoload/airline/extensions.vim +++ b/autoload/airline/extensions.vim @@ -195,10 +195,6 @@ function! airline#extensions#load() endif endif - if get(g:, 'airline#extensions#readonly#enabled', 1) - call airline#extensions#readonly#init() - endif - " load all other extensions not part of the default distribution for file in split(globpath(&rtp, "autoload/airline/extensions/*.vim"), "\n") " check to see that both the resolved and unresolved paths do not match diff --git a/autoload/airline/extensions/branch.vim b/autoload/airline/extensions/branch.vim index 38e54d2a..72c9c886 100644 --- a/autoload/airline/extensions/branch.vim +++ b/autoload/airline/extensions/branch.vim @@ -3,8 +3,7 @@ let s:empty_message = get(g:, 'airline#extensions#branch#empty_message', \ get(g:, 'airline_branch_empty_message', '')) -let s:symbol = get(g:, 'airline#extensions#branch#symbol', - \ get(g:, 'airline_branch_prefix', get(g:, 'airline_powerline_fonts', 0) ? ' ' : '')) +let s:symbol = g:airline_symbols.branch let s:has_fugitive = exists('*fugitive#head') let s:has_fugitive_detect = exists('*fugitive#detect') @@ -28,7 +27,7 @@ function! airline#extensions#branch#get_head() endif endif - return empty(head) ? s:empty_message : s:symbol.head + return empty(head) ? s:empty_message : s:symbol.' '.head endfunction function! airline#extensions#branch#init(ext) diff --git a/autoload/airline/extensions/readonly.vim b/autoload/airline/extensions/readonly.vim deleted file mode 100644 index 8bff4d43..00000000 --- a/autoload/airline/extensions/readonly.vim +++ /dev/null @@ -1,15 +0,0 @@ -" MIT License. Copyright (c) 2013 Bailey Ling. -" vim: et ts=2 sts=2 sw=2 - -let s:symbol = get(g:, 'airline#extensions#readonly#symbol', - \ get(g:, 'airline_readonly_symbol', get(g:, 'airline_powerline_fonts', 0) ? '' : 'RO')) - -function! airline#extensions#readonly#get_mark() - return &ro ? s:symbol : '' -endfunction - -function! airline#extensions#readonly#init() - let g:airline_section_gutter = ' %#airline_file#%{airline#extensions#readonly#get_mark()} ' - \ .g:airline_section_gutter -endfunction - diff --git a/autoload/airline/extensions/whitespace.vim b/autoload/airline/extensions/whitespace.vim index 4cf7fafa..a2c4f1d7 100644 --- a/autoload/airline/extensions/whitespace.vim +++ b/autoload/airline/extensions/whitespace.vim @@ -10,9 +10,7 @@ else let s:show_message = get(g:, 'airline#extensions#whitespace#show_message', 1) endif -let s:symbol = get(g:, 'airline#extensions#whitespace#symbol', - \ get(g:, 'airline_whitespace_symbol', get(g:, 'airline_powerline_fonts', 0) ? '✹' : '!')) - +let s:symbol = g:airline_symbols.whitespace let s:checks = get(g:, 'airline#extensions#whitespace#checks', ['indent', 'trailing']) let s:trailing_format = get(g:, 'airline#extensions#whitespace#trailing_format', 'trailing[%s]') diff --git a/autoload/airline/fragments.vim b/autoload/airline/fragments.vim index aa25f9f6..9e3b8b69 100644 --- a/autoload/airline/fragments.vim +++ b/autoload/airline/fragments.vim @@ -1,13 +1,8 @@ " MIT License. Copyright (c) 2013 Bailey Ling. " vim: et ts=2 sts=2 sw=2 -let g:airline#fragments#symbols = get(g:, 'airline#fragments#symbols', {}) -call extend(g:airline#fragments#symbols, { - \ 'paste': get(g:, 'airline_paste_symbol', g:airline_left_alt_sep.' PASTE') - \ }, 'keep') - function! airline#fragments#get_paste() - return g:airline_detect_paste && &paste ? ' '.g:airline#fragments#symbols.paste : '' + return g:airline_detect_paste && &paste ? ' '.g:airline_symbols.paste : '' endfunction function! airline#fragments#get_iminsert() @@ -17,3 +12,7 @@ function! airline#fragments#get_iminsert() return '' endfunction +function! airline#fragments#get_readonly() + return &readonly ? g:airline_symbols.readonly : '' +endfunction + diff --git a/doc/airline.txt b/doc/airline.txt index 93f7a116..cc9a47bc 100644 --- a/doc/airline.txt +++ b/doc/airline.txt @@ -128,32 +128,32 @@ separators, as well as the powerline font glyths. let g:airline_left_sep = '▶' let g:airline_right_sep = '«' let g:airline_right_sep = '◀' - let g:airline_linecolumn_prefix = '␊ ' - let g:airline_linecolumn_prefix = '␤ ' - let g:airline_linecolumn_prefix = '¶ ' - let g:airline#extensions#branch#symbol = '⎇ ' - let g:airline#fragments#symbols.paste = 'ρ' - let g:airline#fragments#symbols.paste = 'Þ' - let g:airline#fragments#symbols.paste = '∥' - let g:airline#extensions#whitespace#symbol = 'Ξ' + let g:airline_symbols.linenr = '␊' + let g:airline_symbols.linenr = '␤' + let g:airline_symbols.linenr = '¶' + let g:airline_symbols.branch = '⎇' + let g:airline_symbols.paste = 'ρ' + let g:airline_symbols.paste = 'Þ' + let g:airline_symbols.paste = '∥' + let g:airline_symbols.whitespace = 'Ξ' " powerline symbols let g:airline_left_sep = '' let g:airline_left_alt_sep = '' let g:airline_right_sep = '' let g:airline_right_alt_sep = '' - let g:airline#extensions#branch#symbol = ' ' - let g:airline#extensions#readonly#symbol = '' - let g:airline_linecolumn_prefix = ' ' + let g:airline_symbols.branch = '' + let g:airline_symbols.readonly = '' + let g:airline_symbols.linenr = '' " old vim-powerline symbols let g:airline_left_sep = '⮀' let g:airline_left_alt_sep = '⮁' let g:airline_right_sep = '⮂' let g:airline_right_alt_sep = '⮃' - let g:airline#extensions#branch#symbol = '⭠' - let g:airline#extensions#readonly#symbol = '⭤' - let g:airline_linecolumn_prefix = '⭡' + let g:airline_symbols.branch = '⭠' + let g:airline_symbols.readonly = '⭤' + let g:airline_symbols.linenr = '⭡' < For more intricate customizations, you can replace the predefined sections @@ -245,9 +245,6 @@ vim-signify * enable/disable detection of whitespace errors. > let g:airline#extensions#whitespace#enabled = 1 < -* customize the whitespace symbol. > - let g:airline#extensions#whitespace#symbol = '!' -< * configure which whitespace checks to enable. > let g:airline#extensions#whitespace#checks = [ 'indent', 'trailing' ] < diff --git a/plugin/airline.vim b/plugin/airline.vim index 0329aaa7..4a0efd98 100644 --- a/plugin/airline.vim +++ b/plugin/airline.vim @@ -23,12 +23,20 @@ call s:check_defined('g:airline_right_alt_sep', get(g:, 'airline_powerline_fonts 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_linecolumn_prefix', get(g:, 'airline_powerline_fonts', 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_mode_map', { \ '__' : '------', \ 'n' : 'NORMAL', @@ -50,13 +58,13 @@ call s:check_defined('g:airline_theme_map', { \ '.*solarized.*': 'solarized', \ }) -call s:check_defined('g:airline_section_a', '%{get(w:, "airline_current_mode", "")}%{airline#fragments#get_paste()}%{airline#fragments#get_iminsert()}') +call s:check_defined('g:airline_section_a', '%{get(w:,"airline_current_mode","")}%{airline#fragments#get_paste()}%{airline#fragments#get_iminsert()}') call s:check_defined('g:airline_section_b', '') call s:check_defined('g:airline_section_c', '%f%m') -call s:check_defined('g:airline_section_gutter', '%=') +call s:check_defined('g:airline_section_gutter', '%#airline_file#%{airline#fragments#get_readonly()}%=') call s:check_defined('g:airline_section_x', "%{strlen(&filetype)>0?&filetype:''}") call s:check_defined('g:airline_section_y', "%{strlen(&fenc)>0?&fenc:''}%{strlen(&ff)>0?'['.&ff.']':''}") -call s:check_defined('g:airline_section_z', '%3p%% '.g:airline_linecolumn_prefix.'%3l:%3c') +call s:check_defined('g:airline_section_z', '%3p%% %{g:airline_symbols.linenr} %3l:%3c') call s:check_defined('g:airline_section_warning', '__') let s:airline_initialized = 0 From d5d87d2cdc4650ea660ff6815a4fa42a5b318f19 Mon Sep 17 00:00:00 2001 From: Bailey Ling Date: Tue, 27 Aug 2013 14:12:03 +0000 Subject: [PATCH 4/6] reduce variable deprecation. --- autoload/airline/extensions/branch.vim | 2 +- autoload/airline/extensions/whitespace.vim | 2 +- doc/airline.txt | 3 +++ 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/autoload/airline/extensions/branch.vim b/autoload/airline/extensions/branch.vim index 72c9c886..33a8e605 100644 --- a/autoload/airline/extensions/branch.vim +++ b/autoload/airline/extensions/branch.vim @@ -3,7 +3,7 @@ let s:empty_message = get(g:, 'airline#extensions#branch#empty_message', \ get(g:, 'airline_branch_empty_message', '')) -let s:symbol = g:airline_symbols.branch +let s:symbol = get(g:, 'airline#extensions#branch#symbol', g:airline_symbols.branch) let s:has_fugitive = exists('*fugitive#head') let s:has_fugitive_detect = exists('*fugitive#detect') diff --git a/autoload/airline/extensions/whitespace.vim b/autoload/airline/extensions/whitespace.vim index a2c4f1d7..7478a7e9 100644 --- a/autoload/airline/extensions/whitespace.vim +++ b/autoload/airline/extensions/whitespace.vim @@ -10,7 +10,7 @@ else let s:show_message = get(g:, 'airline#extensions#whitespace#show_message', 1) endif -let s:symbol = g:airline_symbols.whitespace +let s:symbol = get(g:, 'airline#extensions#whitespace#symbol', g:airline_symbols.whitespace) let s:checks = get(g:, 'airline#extensions#whitespace#checks', ['indent', 'trailing']) let s:trailing_format = get(g:, 'airline#extensions#whitespace#trailing_format', 'trailing[%s]') diff --git a/doc/airline.txt b/doc/airline.txt index cc9a47bc..4fbaec2e 100644 --- a/doc/airline.txt +++ b/doc/airline.txt @@ -245,6 +245,9 @@ vim-signify * enable/disable detection of whitespace errors. > let g:airline#extensions#whitespace#enabled = 1 < +* customize the whitespace symbol. > + let g:airline#extensions#whitespace#symbol = '!' +< * configure which whitespace checks to enable. > let g:airline#extensions#whitespace#checks = [ 'indent', 'trailing' ] < From 83a1d7e47c5031de6b20df71938ddcb42ad4c9ef Mon Sep 17 00:00:00 2001 From: Bailey Ling Date: Tue, 27 Aug 2013 17:47:31 +0000 Subject: [PATCH 5/6] introduce fragments variable to store all possible parts. --- autoload/airline/fragments.vim | 6 +++--- plugin/airline.vim | 22 ++++++++++++++++------ 2 files changed, 19 insertions(+), 9 deletions(-) diff --git a/autoload/airline/fragments.vim b/autoload/airline/fragments.vim index 9e3b8b69..f3ef5d40 100644 --- a/autoload/airline/fragments.vim +++ b/autoload/airline/fragments.vim @@ -1,18 +1,18 @@ " MIT License. Copyright (c) 2013 Bailey Ling. " vim: et ts=2 sts=2 sw=2 -function! airline#fragments#get_paste() +function! airline#fragments#paste() return g:airline_detect_paste && &paste ? ' '.g:airline_symbols.paste : '' endfunction -function! airline#fragments#get_iminsert() +function! airline#fragments#iminsert() if g:airline_detect_iminsert && &iminsert && exists('b:keymap_name') return ' '.g:airline_left_alt_sep.' '.toupper(b:keymap_name) endif return '' endfunction -function! airline#fragments#get_readonly() +function! airline#fragments#readonly() return &readonly ? g:airline_symbols.readonly : '' endfunction diff --git a/plugin/airline.vim b/plugin/airline.vim index 4a0efd98..17c86bd4 100644 --- a/plugin/airline.vim +++ b/plugin/airline.vim @@ -37,7 +37,16 @@ call extend(g:airline_symbols, { \ 'branch': get(g:, 'airline_branch_prefix', get(g:, 'airline_powerline_fonts', 0) ? '' : ''), \ }, 'keep') -call s:check_defined('g:airline_mode_map', { +call s:check_defined('g:airline_fragments', {}) +call extend(g:airline_fragments, { + \ 'mode': '%{get(w:,"airline_current_mode","")}', + \ 'iminsert': '%{airline#fragments#iminsert()}', + \ 'paste': '%{airline#fragments#paste()}', + \ 'readonly': '%{airline#fragments#readonly()}', + \ }, 'keep') + +call s:check_defined('g:airline_mode_map', {}) +call extend(g:airline_mode_map, { \ '__' : '------', \ 'n' : 'NORMAL', \ 'i' : 'INSERT', @@ -49,19 +58,20 @@ call s:check_defined('g:airline_mode_map', { \ 's' : 'SELECT', \ 'S' : 'S-LINE', \ '' : 'S-BLOCK', - \ }) + \ }, 'keep') -call s:check_defined('g:airline_theme_map', { +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 s:check_defined('g:airline_section_a', '%{get(w:,"airline_current_mode","")}%{airline#fragments#get_paste()}%{airline#fragments#get_iminsert()}') +call s:check_defined('g:airline_section_a', (g:airline_fragments.mode).(g:airline_fragments.paste).(g:airline_fragments.iminsert)) call s:check_defined('g:airline_section_b', '') call s:check_defined('g:airline_section_c', '%f%m') -call s:check_defined('g:airline_section_gutter', '%#airline_file#%{airline#fragments#get_readonly()}%=') +call s:check_defined('g:airline_section_gutter', '%#airline_file#'.(g:airline_fragments.readonly).'%=') call s:check_defined('g:airline_section_x', "%{strlen(&filetype)>0?&filetype:''}") call s:check_defined('g:airline_section_y', "%{strlen(&fenc)>0?&fenc:''}%{strlen(&ff)>0?'['.&ff.']':''}") call s:check_defined('g:airline_section_z', '%3p%% %{g:airline_symbols.linenr} %3l:%3c') From 85c1f5ad03ac52fe50ef607751e20a22fb594f43 Mon Sep 17 00:00:00 2001 From: Bailey Ling Date: Tue, 27 Aug 2013 18:08:50 +0000 Subject: [PATCH 6/6] rename fragments to parts. --- autoload/airline/{fragments.vim => parts.vim} | 6 +++--- plugin/airline.vim | 14 +++++++------- 2 files changed, 10 insertions(+), 10 deletions(-) rename autoload/airline/{fragments.vim => parts.vim} (77%) diff --git a/autoload/airline/fragments.vim b/autoload/airline/parts.vim similarity index 77% rename from autoload/airline/fragments.vim rename to autoload/airline/parts.vim index f3ef5d40..0c7ece9d 100644 --- a/autoload/airline/fragments.vim +++ b/autoload/airline/parts.vim @@ -1,18 +1,18 @@ " MIT License. Copyright (c) 2013 Bailey Ling. " vim: et ts=2 sts=2 sw=2 -function! airline#fragments#paste() +function! airline#parts#paste() return g:airline_detect_paste && &paste ? ' '.g:airline_symbols.paste : '' endfunction -function! airline#fragments#iminsert() +function! airline#parts#iminsert() if g:airline_detect_iminsert && &iminsert && exists('b:keymap_name') return ' '.g:airline_left_alt_sep.' '.toupper(b:keymap_name) endif return '' endfunction -function! airline#fragments#readonly() +function! airline#parts#readonly() return &readonly ? g:airline_symbols.readonly : '' endfunction diff --git a/plugin/airline.vim b/plugin/airline.vim index 17c86bd4..92736231 100644 --- a/plugin/airline.vim +++ b/plugin/airline.vim @@ -37,12 +37,12 @@ call extend(g:airline_symbols, { \ 'branch': get(g:, 'airline_branch_prefix', get(g:, 'airline_powerline_fonts', 0) ? '' : ''), \ }, 'keep') -call s:check_defined('g:airline_fragments', {}) -call extend(g:airline_fragments, { +call s:check_defined('g:airline_parts', {}) +call extend(g:airline_parts, { \ 'mode': '%{get(w:,"airline_current_mode","")}', - \ 'iminsert': '%{airline#fragments#iminsert()}', - \ 'paste': '%{airline#fragments#paste()}', - \ 'readonly': '%{airline#fragments#readonly()}', + \ 'iminsert': '%{airline#parts#iminsert()}', + \ 'paste': '%{airline#parts#paste()}', + \ 'readonly': '%#airline_file#%{airline#parts#readonly()}', \ }, 'keep') call s:check_defined('g:airline_mode_map', {}) @@ -68,10 +68,10 @@ call extend(g:airline_theme_map, { \ '.*solarized.*': 'solarized', \ }, 'keep') -call s:check_defined('g:airline_section_a', (g:airline_fragments.mode).(g:airline_fragments.paste).(g:airline_fragments.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', '') call s:check_defined('g:airline_section_c', '%f%m') -call s:check_defined('g:airline_section_gutter', '%#airline_file#'.(g:airline_fragments.readonly).'%=') +call s:check_defined('g:airline_section_gutter', ' '.(g:airline_parts.readonly).'%=') call s:check_defined('g:airline_section_x', "%{strlen(&filetype)>0?&filetype:''}") call s:check_defined('g:airline_section_y', "%{strlen(&fenc)>0?&fenc:''}%{strlen(&ff)>0?'['.&ff.']':''}") call s:check_defined('g:airline_section_z', '%3p%% %{g:airline_symbols.linenr} %3l:%3c')