Merge branch '256' into dev

Conflicts:
	autoload/airline/init.vim
This commit is contained in:
Bailey Ling
2013-09-22 11:34:35 -04:00
6 changed files with 19 additions and 15 deletions
+1 -1
View File
@@ -33,7 +33,7 @@ function! airline#extensions#branch#get_head()
return empty(head) || !s:check_in_path()
\ ? s:empty_message
\ : printf('%s%s', empty(s:symbol) ? '' : s:symbol.' ', head)
\ : printf('%s%s', empty(s:symbol) ? '' : s:symbol.(g:airline_symbols.space), head)
endfunction
function! s:check_in_path()