Use tagbar#currenttag instead of CFI

Current-func-info is far less used than Tagbar so it should work better to use Tagbar's functionality to display the current tag in the statusline. Closes #139.
doubleotoo · May 14, 2012 · 7bc55be · 7bc55be
1 parent b3069d3
commit 7bc55be
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 11 deletions.
diff --git a/autoload/Powerline/Colorschemes/default.vim b/autoload/Powerline/Colorschemes/default.vim
@@ -84,7 +84,7 @@ let g:Powerline#Colorschemes#default#colorscheme = Pl#Colorscheme#Init([
 		\ 'i': ['brightestred', ['bold']],
 		\ }),
 	\
-	\ Pl#Hi#Segments(['current_function', 'fileformat', 'fileencoding', 'pwd', 'filetype', 'rvm:string', 'rvm:statusline', 'virtualenv:statusline', 'charcode', 'currhigroup'], {
+	\ Pl#Hi#Segments(['currenttag', 'fileformat', 'fileencoding', 'pwd', 'filetype', 'rvm:string', 'rvm:statusline', 'virtualenv:statusline', 'charcode', 'currhigroup'], {
 		\ 'n': ['gray8', 'gray2'],
 		\ 'i': ['mediumcyan', 'darkestblue'],
 		\ }),

diff --git a/autoload/Powerline/Colorschemes/skwp.vim b/autoload/Powerline/Colorschemes/skwp.vim
@@ -105,7 +105,7 @@ let g:Powerline#Colorschemes#skwp#colorscheme = Pl#Colorscheme#Init([
 		\ 'i': ['base03', ['bold']],
 		\ }),
 	\
-	\ Pl#Hi#Segments(['current_function', 'fileformat', 'fileencoding', 'pwd', 'filetype', 'rvm:string', 'rvm:statusline', 'virtualenv:statusline', 'charcode', 'currhigroup'], {
+	\ Pl#Hi#Segments(['currenttag', 'fileformat', 'fileencoding', 'pwd', 'filetype', 'rvm:string', 'rvm:statusline', 'virtualenv:statusline', 'charcode', 'currhigroup'], {
 		\ 'n': ['gray5', 'gray2'],
 		\ 'i': ['mediumcyan', 'base02'],
 		\ }),

diff --git a/autoload/Powerline/Functions/cfi.vim b/autoload/Powerline/Functions/cfi.vim
diff --git a/autoload/Powerline/Segments/cfi.vim b/autoload/Powerline/Segments/cfi.vim
diff --git a/autoload/Powerline/Segments/tagbar.vim b/autoload/Powerline/Segments/tagbar.vim
@@ -0,0 +1,3 @@
+let g:Powerline#Segments#tagbar#segments = Pl#Segment#Init(['tagbar'
+	\ , Pl#Segment#Create('currenttag', '%{tagbar#currenttag("%s", "")}')
+\ ])
diff --git a/autoload/Powerline/Themes/default.vim b/autoload/Powerline/Themes/default.vim
@@ -8,7 +8,7 @@ let g:Powerline#Themes#default#theme = Pl#Theme#Create(
 		\ , 'aurum:status'
 		\ , 'syntastic:errors'
 		\ , Pl#Segment#Truncate()
-		\ , 'cfi:current_function'
+		\ , 'tagbar:currenttag'
 		\ , Pl#Segment#Split()
 		\ , 'rvm:string'
 		\ , 'virtualenv:statusline'