diff options
| -rw-r--r-- | .gitmodules | 3 | ||||
| -rw-r--r-- | files/.vim/autoload/pathogen.vim | 132 | ||||
| m--------- | files/.vim/bundle/vim-pathogen | 0 | ||||
| -rw-r--r-- | files/.vimrc | 8 |
4 files changed, 7 insertions, 136 deletions
diff --git a/.gitmodules b/.gitmodules index a015f3a..d9bb1d0 100644 --- a/.gitmodules +++ b/.gitmodules @@ -22,3 +22,6 @@ [submodule "files/.vim/bundle/vim-jade"] path = files/.vim/bundle/vim-jade url = git://github.com/digitaltoad/vim-jade.git +[submodule "files/.vim/bundle/vim-pathogen"] + path = files/.vim/bundle/vim-pathogen + url = https://github.com/tpope/vim-pathogen diff --git a/files/.vim/autoload/pathogen.vim b/files/.vim/autoload/pathogen.vim deleted file mode 100644 index 8ff5699..0000000 --- a/files/.vim/autoload/pathogen.vim +++ /dev/null @@ -1,132 +0,0 @@ -" pathogen.vim - path option manipulation -" Maintainer: Tim Pope <vimNOSPAM@tpope.org> -" Version: 1.2 - -" Install in ~/.vim/autoload (or ~\vimfiles\autoload). -" -" API is documented below. - -if exists("g:loaded_pathogen") || &cp - finish -endif -let g:loaded_pathogen = 1 - -" Split a path into a list. -function! pathogen#split(path) abort " {{{1 - if type(a:path) == type([]) | return a:path | endif - let split = split(a:path,'\\\@<!\%(\\\\\)*\zs,') - return map(split,'substitute(v:val,''\\\([\\,]\)'',''\1'',"g")') -endfunction " }}}1 - -" Convert a list to a path. -function! pathogen#join(...) abort " {{{1 - if type(a:1) == type(1) && a:1 - let i = 1 - let space = ' ' - else - let i = 0 - let space = '' - endif - let path = "" - while i < a:0 - if type(a:000[i]) == type([]) - let list = a:000[i] - let j = 0 - while j < len(list) - let escaped = substitute(list[j],'[,'.space.']\|\\[\,'.space.']\@=','\\&','g') - let path .= ',' . escaped - let j += 1 - endwhile - else - let path .= "," . a:000[i] - endif - let i += 1 - endwhile - return substitute(path,'^,','','') -endfunction " }}}1 - -" Convert a list to a path with escaped spaces for 'path', 'tag', etc. -function! pathogen#legacyjoin(...) abort " {{{1 - return call('pathogen#join',[1] + a:000) -endfunction " }}}1 - -" Remove duplicates from a list. -function! pathogen#uniq(list) abort " {{{1 - let i = 0 - let seen = {} - while i < len(a:list) - if has_key(seen,a:list[i]) - call remove(a:list,i) - else - let seen[a:list[i]] = 1 - let i += 1 - endif - endwhile - return a:list -endfunction " }}}1 - -" \ on Windows unless shellslash is set, / everywhere else. -function! pathogen#separator() abort " {{{1 - return !exists("+shellslash") || &shellslash ? '/' : '\' -endfunction " }}}1 - -" Convenience wrapper around glob() which returns a list. -function! pathogen#glob(pattern) abort " {{{1 - let files = split(glob(a:pattern),"\n") - return map(files,'substitute(v:val,"[".pathogen#separator()."/]$","","")') -endfunction "}}}1 - -" Like pathogen#glob(), only limit the results to directories. -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 -" 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 rtp = pathogen#split(&rtp) - let path = expand(a:path) - call filter(rtp,'v:val[0:strlen(path)-1] !=# path') - let &rtp = pathogen#join(pathogen#uniq(before + rtp + after)) - return &rtp -endfunction " }}}1 - -" For each directory in rtp, check for a subdirectory named dir. If it -" exists, add all subdirectories of that subdirectory to the rtp, immediately -" after the original directory. If no argument is given, 'bundle' is used. -" Repeated calls with the same arguments are ignored. -function! pathogen#runtime_append_all_bundles(...) " {{{1 - let sep = pathogen#separator() - let name = a:0 ? a:1 : 'bundle' - if "\n".s:done_bundles =~# "\\M\n".name."\n" - return "" - endif - let s:done_bundles .= name . "\n" - let list = [] - for dir in pathogen#split(&rtp) - if dir =~# '\<after$' - let list += pathogen#glob_directories(substitute(dir,'after$',name,'').sep.'*[^~]'.sep.'after') + [dir] - else - let list += [dir] + pathogen#glob_directories(dir.sep.name.sep.'*[^~]') - endif - endfor - let &rtp = pathogen#join(pathogen#uniq(list)) - return 1 -endfunction - -let s:done_bundles = '' -" }}}1 - -" Invoke :helptags on all non-$VIM doc directories in runtimepath. -function! pathogen#helptags() " {{{1 - for dir in pathogen#split(&rtp) - if dir[0 : strlen($VIM)-1] !=# $VIM && isdirectory(dir.'/doc') && (!filereadable(dir.'/doc/tags') || filewritable(dir.'/doc/tags')) - helptags `=dir.'/doc'` - endif - endfor -endfunction " }}}1 - -" vim:set ft=vim ts=8 sw=2 sts=2: diff --git a/files/.vim/bundle/vim-pathogen b/files/.vim/bundle/vim-pathogen new file mode 160000 +Subproject 1270dceb1fe0ca35f8b292c7b41b45b42c5a0cc diff --git a/files/.vimrc b/files/.vimrc index bf301e1..d3927fa 100644 --- a/files/.vimrc +++ b/files/.vimrc @@ -25,13 +25,13 @@ set hidden set showcmd " По умолчанию пользоваться :help справкой set keywordprg= + +filetype off " Do so to reload filetype plugins after pathogen +runtime bundle/vim-pathogen/autoload/pathogen.vim +call pathogen#infect() if &t_Co > 2 || has('gui_running') syntax on endif - -filetype off " Do so to reload filetype plugins after pathogen -call pathogen#helptags() -call pathogen#runtime_append_all_bundles() filetype plugin indent on runtime! macros/matchit.vim |