Don't add empty segments to the buffer_segment array

If segments for some reason are disabled (e.g. because a required plugin isn't loaded) they shouldn't be added to the buffer_segment array.
rainux · Jan 21, 2012 · 260ec8f · 260ec8f
1 parent 168e5a0
commit 260ec8f
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/autoload/Pl/Segment.vim b/autoload/Pl/Segment.vim
@@ -158,7 +158,7 @@ function! Pl#Segment#Get(name) " {{{
 			let return_segment = deepcopy(g:Powerline#Segments#segments[seg_name])
 		catch
 			" Didn't find the segment among the common segments either, just skip it
-			let return_segment = {}
+			return {}
 		endtry
 	endtry
 

diff --git a/autoload/Pl/Theme.vim b/autoload/Pl/Theme.vim
@@ -42,14 +42,17 @@ function! Pl#Theme#Buffer(ns, ...) " {{{
 
 		let segment = Pl#Segment#Get(item)
 
-		call add(segments, segment)
+		if ! empty(segment)
+			" Skip empty (possible disabled) segments
+			call add(segments, segment)
+		endif
 
 		unlet! item
 	endfor
 
 	return {
-		\ 	'matches': matches,
-		\ 	'segments': segments
+		\ 'matches': matches,
+		\ 'segments': segments
 		\ }
 endfunction " }}}
 function! Pl#Theme#InsertSegment(new_segment, where, target_segment) " {{{