Skip to content

Commit

Permalink
Upgrade pathogen
Browse files Browse the repository at this point in the history
Add powerline
  • Loading branch information
tooky committed Jan 13, 2012
1 parent 63a99c6 commit 0964c60
Show file tree
Hide file tree
Showing 6 changed files with 199 additions and 12 deletions.
3 changes: 3 additions & 0 deletions .gitmodules
Expand Up @@ -61,3 +61,6 @@
[submodule "vim/bundle/vim-tabular"]
path = vim/bundle/vim-tabular
url = git://github.com/godlygeek/tabular.git
[submodule "vim/bundle/vim-powerline"]
path = vim/bundle/vim-powerline
url = git://github.com/Lokaltog/vim-powerline.git
3 changes: 2 additions & 1 deletion vim/.netrwhist
@@ -1,4 +1,5 @@
let g:netrw_dirhistmax =10
let g:netrw_dirhist_cnt =2
let g:netrw_dirhist_cnt =3
let g:netrw_dirhist_1='/Users/steve/.rvm/gems/ruby-1.9.2-p136@ciab/gems/capybara-0.4.1.2'
let g:netrw_dirhist_2='/Users/steve/Code/coach_in_a_box/app/stylesheets/partials'
let g:netrw_dirhist_3='/Users/steve/Code/coach_in_a_box/app/views/admin/invoicing_details'
133 changes: 123 additions & 10 deletions vim/autoload/pathogen.vim
@@ -1,16 +1,35 @@
" pathogen.vim - path option manipulation
" Maintainer: Tim Pope <vimNOSPAM@tpope.org>
" Version: 1.2
" Maintainer: Tim Pope <http://tpo.pe/>
" Version: 2.0

" Install in ~/.vim/autoload (or ~\vimfiles\autoload).
"
" API is documented below.
" For management of individually installed plugins in ~/.vim/bundle (or
" ~\vimfiles\bundle), adding `call pathogen#infect()` to your .vimrc
" prior to `filetype plugin indent on` is the only other setup necessary.
"
" The API is documented inline below. For maximum ease of reading,
" :set foldmethod=marker

if exists("g:loaded_pathogen") || &cp
finish
endif
let g:loaded_pathogen = 1

" Point of entry for basic default usage. Give a directory name to invoke
" pathogen#runtime_append_all_bundles() (defaults to "bundle"), or a full path
" to invoke pathogen#runtime_prepend_subdirectories(). Afterwards,
" pathogen#cycle_filetype() is invoked.
function! pathogen#infect(...) abort " {{{1
let source_path = a:0 ? a:1 : 'bundle'
if source_path =~# '[\\/]'
call pathogen#runtime_prepend_subdirectories(source_path)
else
call pathogen#runtime_append_all_bundles(source_path)
endif
call pathogen#cycle_filetype()
endfunction " }}}1

" Split a path into a list.
function! pathogen#split(path) abort " {{{1
if type(a:path) == type([]) | return a:path | endif
Expand Down Expand Up @@ -55,8 +74,11 @@ function! pathogen#uniq(list) abort " {{{1
let i = 0
let seen = {}
while i < len(a:list)
if has_key(seen,a:list[i])
if (a:list[i] ==# '' && exists('empty')) || has_key(seen,a:list[i])
call remove(a:list,i)
elseif a:list[i] ==# ''
let i += 1
let empty = 1
else
let seen[a:list[i]] = 1
let i += 1
Expand All @@ -81,12 +103,32 @@ function! pathogen#glob_directories(pattern) abort " {{{1
return filter(pathogen#glob(a:pattern),'isdirectory(v:val)')
endfunction "}}}1

" Prepend all subdirectories of path to the rtp, and append all after
" Turn filetype detection off and back on again if it was already enabled.
function! pathogen#cycle_filetype() " {{{1
if exists('g:did_load_filetypes')
filetype off
filetype on
endif
endfunction " }}}1

" Checks if a bundle is 'disabled'. A bundle is considered 'disabled' if
" its 'basename()' is included in g:pathogen_disabled[]' or ends in a tilde.
function! pathogen#is_disabled(path) " {{{1
if a:path =~# '\~$'
return 1
elseif !exists("g:pathogen_disabled")
return 0
endif
let sep = pathogen#separator()
return index(g:pathogen_disabled, strpart(a:path, strridx(a:path, sep)+1)) != -1
endfunction "}}}1

" Prepend all subdirectories of path to the rtp, and append all 'after'
" directories in those subdirectories.
function! pathogen#runtime_prepend_subdirectories(path) " {{{1
let sep = pathogen#separator()
let before = pathogen#glob_directories(a:path.sep."*[^~]")
let after = pathogen#glob_directories(a:path.sep."*[^~]".sep."after")
let before = filter(pathogen#glob_directories(a:path.sep."*"), '!pathogen#is_disabled(v:val)')
let after = filter(pathogen#glob_directories(a:path.sep."*".sep."after"), '!pathogen#is_disabled(v:val[0:-7])')
let rtp = pathogen#split(&rtp)
let path = expand(a:path)
call filter(rtp,'v:val[0:strlen(path)-1] !=# path')
Expand All @@ -108,9 +150,9 @@ function! pathogen#runtime_append_all_bundles(...) " {{{1
let list = []
for dir in pathogen#split(&rtp)
if dir =~# '\<after$'
let list += pathogen#glob_directories(substitute(dir,'after$',name.sep.'*[^~]'.sep.'after','')) + [dir]
let list += filter(pathogen#glob_directories(substitute(dir,'after$',name,'').sep.'*[^~]'.sep.'after'), '!pathogen#is_disabled(v:val[0:-7])') + [dir]
else
let list += [dir] + pathogen#glob_directories(dir.sep.name.sep.'*[^~]')
let list += [dir] + filter(pathogen#glob_directories(dir.sep.name.sep.'*[^~]'), '!pathogen#is_disabled(v:val)')
endif
endfor
let &rtp = pathogen#join(pathogen#uniq(list))
Expand All @@ -122,11 +164,82 @@ let s:done_bundles = ''

" Invoke :helptags on all non-$VIM doc directories in runtimepath.
function! pathogen#helptags() " {{{1
let sep = pathogen#separator()
for dir in pathogen#split(&rtp)
if dir[0 : strlen($VIM)-1] !=# $VIM && isdirectory(dir.'/doc') && (!filereadable(dir.'/doc/tags') || filewritable(dir.'/doc/tags'))
if (dir.sep)[0 : strlen($VIMRUNTIME)] !=# $VIMRUNTIME.sep && filewritable(dir.sep.'doc') == 2 && !empty(glob(dir.sep.'doc'.sep.'*')) && (!filereadable(dir.sep.'doc'.sep.'tags') || filewritable(dir.sep.'doc'.sep.'tags'))
helptags `=dir.'/doc'`
endif
endfor
endfunction " }}}1

command! -bar Helptags :call pathogen#helptags()

" Like findfile(), but hardcoded to use the runtimepath.
function! pathogen#runtime_findfile(file,count) "{{{1
let rtp = pathogen#join(1,pathogen#split(&rtp))
return fnamemodify(findfile(a:file,rtp,a:count),':p')
endfunction " }}}1

" Backport of fnameescape().
function! pathogen#fnameescape(string) " {{{1
if exists('*fnameescape')
return fnameescape(a:string)
elseif a:string ==# '-'
return '\-'
else
return substitute(escape(a:string," \t\n*?[{`$\\%#'\"|!<"),'^[+>]','\\&','')
endif
endfunction " }}}1

function! s:find(count,cmd,file,lcd) " {{{1
let rtp = pathogen#join(1,pathogen#split(&runtimepath))
let file = pathogen#runtime_findfile(a:file,a:count)
if file ==# ''
return "echoerr 'E345: Can''t find file \"".a:file."\" in runtimepath'"
elseif a:lcd
let path = file[0:-strlen(a:file)-2]
execute 'lcd `=path`'
return a:cmd.' '.pathogen#fnameescape(a:file)
else
return a:cmd.' '.pathogen#fnameescape(file)
endif
endfunction " }}}1

function! s:Findcomplete(A,L,P) " {{{1
let sep = pathogen#separator()
let cheats = {
\'a': 'autoload',
\'d': 'doc',
\'f': 'ftplugin',
\'i': 'indent',
\'p': 'plugin',
\'s': 'syntax'}
if a:A =~# '^\w[\\/]' && has_key(cheats,a:A[0])
let request = cheats[a:A[0]].a:A[1:-1]
else
let request = a:A
endif
let pattern = substitute(request,'\'.sep,'*'.sep,'g').'*'
let found = {}
for path in pathogen#split(&runtimepath)
let path = expand(path, ':p')
let matches = split(glob(path.sep.pattern),"\n")
call map(matches,'isdirectory(v:val) ? v:val.sep : v:val')
call map(matches,'expand(v:val, ":p")[strlen(path)+1:-1]')
for match in matches
let found[match] = 1
endfor
endfor
return sort(keys(found))
endfunction " }}}1

command! -bar -bang -range=1 -nargs=1 -complete=customlist,s:Findcomplete Ve :execute s:find(<count>,'edit<bang>',<q-args>,0)
command! -bar -bang -range=1 -nargs=1 -complete=customlist,s:Findcomplete Vedit :execute s:find(<count>,'edit<bang>',<q-args>,0)
command! -bar -bang -range=1 -nargs=1 -complete=customlist,s:Findcomplete Vopen :execute s:find(<count>,'edit<bang>',<q-args>,1)
command! -bar -bang -range=1 -nargs=1 -complete=customlist,s:Findcomplete Vsplit :execute s:find(<count>,'split',<q-args>,<bang>1)
command! -bar -bang -range=1 -nargs=1 -complete=customlist,s:Findcomplete Vvsplit :execute s:find(<count>,'vsplit',<q-args>,<bang>1)
command! -bar -bang -range=1 -nargs=1 -complete=customlist,s:Findcomplete Vtabedit :execute s:find(<count>,'tabedit',<q-args>,<bang>1)
command! -bar -bang -range=1 -nargs=1 -complete=customlist,s:Findcomplete Vpedit :execute s:find(<count>,'pedit',<q-args>,<bang>1)
command! -bar -bang -range=1 -nargs=1 -complete=customlist,s:Findcomplete Vread :execute s:find(<count>,'read',<q-args>,<bang>1)

" vim:set ft=vim ts=8 sw=2 sts=2:
69 changes: 69 additions & 0 deletions vim/bundle/vim-outliner/doc/tags
@@ -0,0 +1,69 @@
otl-plugin otl.txt /*otl-plugin*
otluser.txt otl.txt /*otluser.txt*
outliner otl.txt /*outliner*
tvo otl.txt /*tvo*
tvo-- otl.txt /*tvo--*
tvo-<C-CR> otl.txt /*tvo-<C-CR>*
tvo-<C-RightMouse> otl.txt /*tvo-<C-RightMouse>*
tvo-<C-T> otl.txt /*tvo-<C-T>*
tvo-<C-]> otl.txt /*tvo-<C-]>*
tvo-<LocalLeader>1 otl.txt /*tvo-<LocalLeader>1*
tvo-<LocalLeader>2 otl.txt /*tvo-<LocalLeader>2*
tvo-<LocalLeader>3 otl.txt /*tvo-<LocalLeader>3*
tvo-<LocalLeader>4 otl.txt /*tvo-<LocalLeader>4*
tvo-<LocalLeader>5 otl.txt /*tvo-<LocalLeader>5*
tvo-<LocalLeader>6 otl.txt /*tvo-<LocalLeader>6*
tvo-<LocalLeader>7 otl.txt /*tvo-<LocalLeader>7*
tvo-<LocalLeader>8 otl.txt /*tvo-<LocalLeader>8*
tvo-<LocalLeader>9 otl.txt /*tvo-<LocalLeader>9*
tvo-<LocalLeader>< otl.txt /*tvo-<LocalLeader><*
tvo-<LocalLeader>> otl.txt /*tvo-<LocalLeader>>*
tvo-<LocalLeader>C otl.txt /*tvo-<LocalLeader>C*
tvo-<LocalLeader>D otl.txt /*tvo-<LocalLeader>D*
tvo-<LocalLeader>F otl.txt /*tvo-<LocalLeader>F*
tvo-<LocalLeader>H otl.txt /*tvo-<LocalLeader>H*
tvo-<LocalLeader>O otl.txt /*tvo-<LocalLeader>O*
tvo-<LocalLeader>P otl.txt /*tvo-<LocalLeader>P*
tvo-<LocalLeader>T otl.txt /*tvo-<LocalLeader>T*
tvo-<LocalLeader>[ otl.txt /*tvo-<LocalLeader>[*
tvo-<LocalLeader>] otl.txt /*tvo-<LocalLeader>]*
tvo-<LocalLeader>a otl.txt /*tvo-<LocalLeader>a*
tvo-<LocalLeader>b otl.txt /*tvo-<LocalLeader>b*
tvo-<LocalLeader>d otl.txt /*tvo-<LocalLeader>d*
tvo-<LocalLeader>f otl.txt /*tvo-<LocalLeader>f*
tvo-<LocalLeader>h otl.txt /*tvo-<LocalLeader>h*
tvo-<LocalLeader>j otl.txt /*tvo-<LocalLeader>j*
tvo-<LocalLeader>k otl.txt /*tvo-<LocalLeader>k*
tvo-<LocalLeader>o otl.txt /*tvo-<LocalLeader>o*
tvo-<LocalLeader>p otl.txt /*tvo-<LocalLeader>p*
tvo-<LocalLeader>t otl.txt /*tvo-<LocalLeader>t*
tvo-<LocalLeader>u otl.txt /*tvo-<LocalLeader>u*
tvo-<LocalLeader>w otl.txt /*tvo-<LocalLeader>w*
tvo-<LocalLeader>y otl.txt /*tvo-<LocalLeader>y*
tvo-<M-Down> otl.txt /*tvo-<M-Down>*
tvo-<M-S-Down> otl.txt /*tvo-<M-S-Down>*
tvo-<M-S-Left> otl.txt /*tvo-<M-S-Left>*
tvo-<M-S-Right> otl.txt /*tvo-<M-S-Right>*
tvo-<M-S-Up> otl.txt /*tvo-<M-S-Up>*
tvo-<M-S-kMinus> otl.txt /*tvo-<M-S-kMinus>*
tvo-<M-S-kPlus> otl.txt /*tvo-<M-S-kPlus>*
tvo-<M-Up> otl.txt /*tvo-<M-Up>*
tvo-<Shift-Tab> otl.txt /*tvo-<Shift-Tab>*
tvo-<Tab> otl.txt /*tvo-<Tab>*
tvo-= otl.txt /*tvo-=*
tvo-J otl.txt /*tvo-J*
tvo-O otl.txt /*tvo-O*
tvo-commands otl.txt /*tvo-commands*
tvo-folding otl.txt /*tvo-folding*
tvo-g<C-]> otl.txt /*tvo-g<C-]>*
tvo-g<LeftMouse> otl.txt /*tvo-g<LeftMouse>*
tvo-g<RightMouse> otl.txt /*tvo-g<RightMouse>*
tvo-intro otl.txt /*tvo-intro*
tvo-macros otl.txt /*tvo-macros*
tvo-mappings otl.txt /*tvo-mappings*
tvo-mouse otl.txt /*tvo-mouse*
tvo-o otl.txt /*tvo-o*
tvo-outlines otl.txt /*tvo-outlines*
tvo-settings otl.txt /*tvo-settings*
tvo-toolbar otl.txt /*tvo-toolbar*
tvo-word-compatibility otl.txt /*tvo-word-compatibility*
1 change: 1 addition & 0 deletions vim/bundle/vim-powerline
Submodule vim-powerline added at 90c175
2 changes: 1 addition & 1 deletion vimrc
@@ -1,6 +1,6 @@
filetype off

call pathogen#runtime_append_all_bundles()
call pathogen#infect()

syntax on
filetype plugin indent on
Expand Down

0 comments on commit 0964c60

Please sign in to comment.