Merge remote-tracking branch 'chrisbra/master'

Prevent error when g:airline_section_x is undefined. Fixes vim-airline/vim-airline#1627: vim-airline/vim-airline#1627
slabua · Jan 14, 2018 · fb6fe4d · fb6fe4d
2 parents 009d24e + 0cc8062
commit fb6fe4d
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/plugin/webdevicons.vim b/plugin/webdevicons.vim
@@ -694,7 +694,8 @@ endfunction
 
 " scope: public
 function! AirlineWebDevIcons(...)
-  let w:airline_section_x = get(w:, 'airline_section_x', g:airline_section_x)
+  let w:airline_section_x = get(w:, 'airline_section_x',
+        \ get(g:, 'airline_section_x', ''))
   let w:airline_section_x .= ' %{WebDevIconsGetFileTypeSymbol()} '
   let hasFileFormatEncodingPart = airline#parts#ffenc() != ''
   if g:webdevicons_enable_airline_statusline_fileformat_symbols && hasFileFormatEncodingPart