Merge branch 'symbols'

autoload/airline/extensions.vim

@@ -195,18 +195,6 @@ function! airline#extensions#load()
     endif
   endif
 
-  if get(g:, 'airline#extensions#readonly#enabled', 1)
-    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
-
   " 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

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 = 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')
@@ -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)

autoload/airline/extensions/iminsert.vim

@@ -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
-

autoload/airline/extensions/paste.vim

@@ -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
-

autoload/airline/extensions/readonly.vim

@@ -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
-

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 = 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]')

autoload/airline/parts.vim

@@ -0,0 +1,18 @@
+" MIT License. Copyright (c) 2013 Bailey Ling.
+" vim: et ts=2 sts=2 sw=2
+
+function! airline#parts#paste()
+  return g:airline_detect_paste && &paste ? '  '.g:airline_symbols.paste : ''
+endfunction
+
+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#parts#readonly()
+  return &readonly ? g:airline_symbols.readonly : ''
+endfunction
+