Merge from private repo

2017-11-22 21:56:56 +01:00 · 2017-11-22 21:56:56 +01:00 · 615b47a436
commit 615b47a436
parent 084a6aa34f cfc0e4f28f
6 changed files with 3 additions and 14 deletions
--- a/bundles-init/tagbar.cfg.vim
+++ b/bundles-init/tagbar.cfg.vim
@ -1,11 +0,0 @@
-" Extra syntax
-" Make
-let g:tagbar_type_make = {
-	\ 'kinds':[
-		\ 'm:macros',
-		\ 't:targets'
-	\ ]
-\ }
-
-nnoremap <silent> <Leader>t :Tagbar<CR>
-autocmd VimEnter * if argc() > 0 && &columns > 150 | execute "Tagbar" | endif
--- a/bundles-init/tagbar.load.vim
+++ b/bundles-init/tagbar.load.vim
@ -1 +0,0 @@
-NeoBundle 'majutsushi/tagbar'
--- a/bundles-init/undotree.cfg.vim
+++ b/bundles-init/undotree.cfg.vim
@ -0,0 +1 @@
+nnoremap <Leader>u :UndotreeToggle<CR>
--- a/bundles-init/undotree.load.vim
+++ b/bundles-init/undotree.load.vim
@ -0,0 +1 @@
+NeoBundle 'mbbill/undotree'
--- a/bundles-init/vim-airline.load.vim
+++ b/bundles-init/vim-airline.load.vim
@ -1,3 +1,3 @@
 NeoBundle 'bling/vim-airline' , {
-\		'depends' : [ 'ctrlpvim/ctrlp.vim' , 'majutsushi/tagbar' ]
+\		'depends' : [ 'ctrlpvim/ctrlp.vim' ]
 \	}
--- a/ftplugin/qf.vim
+++ b/ftplugin/qf.vim
@ -4,4 +4,3 @@ setlocal cursorline
 setlocal nowrap
 setlocal tw=0
 setlocal nonumber
-wincmd J	" That's for when it spawns inside the tagbar