aboutsummaryrefslogtreecommitdiff
path: root/vim
diff options
context:
space:
mode:
authorKarel Kočí <cynerd@email.cz>2016-09-06 23:17:12 +0200
committerKarel Kočí <cynerd@email.cz>2016-09-06 23:17:12 +0200
commitafae51a1213caa58164389015469dba5381a1a80 (patch)
tree0cf3f9b3078b29c6588b1045e4a6e53d49281a31 /vim
parentbe7f37817faa7656ab211feb8abbece9e9dd980d (diff)
downloadmyconfigs-afae51a1213caa58164389015469dba5381a1a80.tar.gz
myconfigs-afae51a1213caa58164389015469dba5381a1a80.tar.bz2
myconfigs-afae51a1213caa58164389015469dba5381a1a80.zip
Various tweaks to configurations
Diffstat (limited to 'vim')
m---------vim/3rdparty/vim-pathogen0
-rw-r--r--vim/3rdparty/vim-pathogen/CONTRIBUTING.markdown14
-rw-r--r--vim/3rdparty/vim-pathogen/README.markdown141
-rw-r--r--vim/3rdparty/vim-pathogen/autoload/pathogen.vim353
-rw-r--r--vim/autoload/autoload/pathogen.vim353
-rw-r--r--vim/autoload/pathogen.vim38
6 files changed, 22 insertions, 877 deletions
diff --git a/vim/3rdparty/vim-pathogen b/vim/3rdparty/vim-pathogen
new file mode 160000
+Subproject 8c91196cfd9c8fe619f35fac6f2ac81be10677f
diff --git a/vim/3rdparty/vim-pathogen/CONTRIBUTING.markdown b/vim/3rdparty/vim-pathogen/CONTRIBUTING.markdown
deleted file mode 100644
index f5a62ca..0000000
--- a/vim/3rdparty/vim-pathogen/CONTRIBUTING.markdown
+++ /dev/null
@@ -1,14 +0,0 @@
-If your [commit message sucks](http://stopwritingramblingcommitmessages.com/),
-I'm not going to accept your pull request. I've explained very politely
-dozens of times that
-[my general guidelines](http://tbaggery.com/2008/04/19/a-note-about-git-commit-messages.html)
-are absolute rules on my own repositories, so I may lack the energy to
-explain it to you yet another time. And please, if I ask you to change
-something, `git commit --amend`.
-
-Beyond that, don't be shy about asking before patching. What takes you
-hours might take me minutes simply because I have both domain knowledge
-and a perverse knowledge of Vim script so vast that many would consider
-it a symptom of mental illness. On the flip side, some ideas I'll
-reject no matter how good the implementation is. "Send a patch" is an
-edge case answer in my book.
diff --git a/vim/3rdparty/vim-pathogen/README.markdown b/vim/3rdparty/vim-pathogen/README.markdown
deleted file mode 100644
index 00c2878..0000000
--- a/vim/3rdparty/vim-pathogen/README.markdown
+++ /dev/null
@@ -1,141 +0,0 @@
-# pathogen.vim
-
-Manage your `'runtimepath'` with ease. In practical terms, pathogen.vim
-makes it super easy to install plugins and runtime files in their own
-private directories.
-
-## Installation
-
-Install to `~/.vim/autoload/pathogen.vim`. Or copy and paste:
-
- mkdir -p ~/.vim/autoload ~/.vim/bundle && \
- curl -LSso ~/.vim/autoload/pathogen.vim https://tpo.pe/pathogen.vim
-
-If you're using Windows, change all occurrences of `~/.vim` to `~\vimfiles`.
-
-## Runtime Path Manipulation
-
-Add this to your vimrc:
-
- execute pathogen#infect()
-
-If you're brand new to Vim and lacking a vimrc, `vim ~/.vimrc` and paste
-in the following super-minimal example:
-
- execute pathogen#infect()
- syntax on
- filetype plugin indent on
-
-Now any plugins you wish to install can be extracted to a subdirectory
-under `~/.vim/bundle`, and they will be added to the `'runtimepath'`.
-Observe:
-
- cd ~/.vim/bundle && \
- git clone git://github.com/tpope/vim-sensible.git
-
-Now [sensible.vim](https://github.com/tpope/vim-sensible) is installed.
-If you really want to get crazy, you could set it up as a submodule in
-whatever repository you keep your dot files in. I don't like to get
-crazy.
-
-If you don't like the directory name `bundle`, you can pass a runtime relative
-glob as an argument:
-
- execute pathogen#infect('stuff/{}')
-
-The `{}` indicates where the expansion should occur.
-
-You can also pass an absolute path instead. I keep the plugins I maintain under `~/src`, and this is how I add them:
-
- execute pathogen#infect('bundle/{}', '~/src/vim/bundle/{}')
-
-Normally to generate documentation, Vim expects you to run `:helptags`
-on each directory with documentation (e.g., `:helptags ~/.vim/doc`).
-Provided with pathogen.vim is a `:Helptags` command that does this on
-every directory in your `'runtimepath'`. If you really want to get
-crazy, you could even invoke `Helptags` in your vimrc. I don't like to
-get crazy.
-
-Finally, pathogen.vim has a rich API that can manipulate `'runtimepath'`
-and other comma-delimited path options in ways most people will never
-need to do. If you're one of those edge cases, look at the source.
-It's well documented.
-
-## Runtime File Editing
-
-`:Vopen`, `:Vedit`, `:Vsplit`, `:Vvsplit`, `:Vtabedit`, `:Vpedit`, and
-`:Vread` have all moved to [scriptease.vim][].
-
-[scriptease.vim]: https://github.com/tpope/vim-scriptease
-
-## FAQ
-
-> Can I put pathogen.vim in a submodule like all my other plugins?
-
-Sure, stick it under `~/.vim/bundle`, and prepend the following to your
-vimrc:
-
- runtime bundle/vim-pathogen/autoload/pathogen.vim
-
-Or if your bundles are somewhere other than `~/.vim` (say, `~/src/vim`):
-
- source ~/src/vim/bundle/vim-pathogen/autoload/pathogen.vim
-
-> Will you accept these 14 pull requests adding a `.gitignore` for
-> `tags` so I don't see untracked changes in my dot files repository?
-
-No, but I'll teach you how to ignore `tags` globally:
-
- git config --global core.excludesfile '~/.cvsignore'
- echo tags >> ~/.cvsignore
-
-While any filename will work, I've chosen to follow the ancient
-tradition of `.cvsignore` because utilities like rsync use it, too.
-Clever, huh?
-
-> What about Vimballs?
-
-If you really must use one:
-
- :e name.vba
- :!mkdir ~/.vim/bundle/name
- :UseVimball ~/.vim/bundle/name
-
-> Why don't my plugins load when I use Vim sessions?
-
-Vim sessions default to capturing all global options, which includes the
-`'runtimepath'` that pathogen.vim manipulates. This can cause other problems
-too, so I recommend turning that behavior off:
-
- set sessionoptions-=options
-
-## Contributing
-
-If your [commit message sucks](http://stopwritingramblingcommitmessages.com/),
-I'm not going to accept your pull request. I've explained very politely
-dozens of times that
-[my general guidelines](http://tbaggery.com/2008/04/19/a-note-about-git-commit-messages.html)
-are absolute rules on my own repositories, so I may lack the energy to
-explain it to you yet another time. And please, if I ask you to change
-something, `git commit --amend`.
-
-Beyond that, don't be shy about asking before patching. What takes you
-hours might take me minutes simply because I have both domain knowledge
-and a perverse knowledge of Vim script so vast that many would consider
-it a symptom of mental illness. On the flip side, some ideas I'll
-reject no matter how good the implementation is. "Send a patch" is an
-edge case answer in my book.
-
-## Self-Promotion
-
-Like pathogen.vim? Follow the repository on
-[GitHub](https://github.com/tpope/vim-pathogen) and vote for it on
-[vim.org](http://www.vim.org/scripts/script.php?script_id=2332). And if
-you're feeling especially charitable, follow [tpope](http://tpo.pe/) on
-[Twitter](http://twitter.com/tpope) and
-[GitHub](https://github.com/tpope).
-
-## License
-
-Copyright (c) Tim Pope. Distributed under the same terms as Vim itself.
-See `:help license`.
diff --git a/vim/3rdparty/vim-pathogen/autoload/pathogen.vim b/vim/3rdparty/vim-pathogen/autoload/pathogen.vim
deleted file mode 100644
index 59a75c1..0000000
--- a/vim/3rdparty/vim-pathogen/autoload/pathogen.vim
+++ /dev/null
@@ -1,353 +0,0 @@
-" pathogen.vim - path option manipulation
-" Maintainer: Tim Pope <http://tpo.pe/>
-" Version: 2.4
-
-" Install in ~/.vim/autoload (or ~\vimfiles\autoload).
-"
-" For management of individually installed plugins in ~/.vim/bundle (or
-" ~\vimfiles\bundle), adding `execute pathogen#infect()` to the top of your
-" .vimrc is the only other setup necessary.
-"
-" The API is documented inline below.
-
-if exists("g:loaded_pathogen") || &cp
- finish
-endif
-let g:loaded_pathogen = 1
-
-" Point of entry for basic default usage. Give a relative path to invoke
-" pathogen#interpose() (defaults to "bundle/{}"), or an absolute path to invoke
-" pathogen#surround(). Curly braces are expanded with pathogen#expand():
-" "bundle/{}" finds all subdirectories inside "bundle" inside all directories
-" in the runtime path.
-function! pathogen#infect(...) abort
- for path in a:0 ? filter(reverse(copy(a:000)), 'type(v:val) == type("")') : ['bundle/{}']
- if path =~# '^\%({\=[$~\\/]\|{\=\w:[\\/]\).*[{}*]'
- call pathogen#surround(path)
- elseif path =~# '^\%([$~\\/]\|\w:[\\/]\)'
- call s:warn('Change pathogen#infect('.string(path).') to pathogen#infect('.string(path.'/{}').')')
- call pathogen#surround(path . '/{}')
- elseif path =~# '[{}*]'
- call pathogen#interpose(path)
- else
- call s:warn('Change pathogen#infect('.string(path).') to pathogen#infect('.string(path.'/{}').')')
- call pathogen#interpose(path . '/{}')
- endif
- endfor
- call pathogen#cycle_filetype()
- if pathogen#is_disabled($MYVIMRC)
- return 'finish'
- endif
- return ''
-endfunction
-
-" Split a path into a list.
-function! pathogen#split(path) abort
- if type(a:path) == type([]) | return a:path | endif
- if empty(a:path) | return [] | endif
- let split = split(a:path,'\\\@<!\%(\\\\\)*\zs,')
- return map(split,'substitute(v:val,''\\\([\\,]\)'',''\1'',"g")')
-endfunction
-
-" Convert a list to a path.
-function! pathogen#join(...) abort
- 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
-
-" Convert a list to a path with escaped spaces for 'path', 'tag', etc.
-function! pathogen#legacyjoin(...) abort
- return call('pathogen#join',[1] + a:000)
-endfunction
-
-" Turn filetype detection off and back on again if it was already enabled.
-function! pathogen#cycle_filetype() abort
- if exists('g:did_load_filetypes')
- filetype off
- filetype on
- endif
-endfunction
-
-" Check if a bundle is disabled. A bundle is considered disabled if its
-" basename or full name is included in the list g:pathogen_blacklist or the
-" comma delimited environment variable $VIMBLACKLIST.
-function! pathogen#is_disabled(path) abort
- if a:path =~# '\~$'
- return 1
- endif
- let sep = pathogen#slash()
- let blacklist =
- \ get(g:, 'pathogen_blacklist', get(g:, 'pathogen_disabled', [])) +
- \ pathogen#split($VIMBLACKLIST)
- if !empty(blacklist)
- call map(blacklist, 'substitute(v:val, "[\\/]$", "", "")')
- endif
- return index(blacklist, fnamemodify(a:path, ':t')) != -1 || index(blacklist, a:path) != -1
-endfunction
-
-" Prepend the given directory to the runtime path and append its corresponding
-" after directory. Curly braces are expanded with pathogen#expand().
-function! pathogen#surround(path) abort
- let sep = pathogen#slash()
- let rtp = pathogen#split(&rtp)
- let path = fnamemodify(a:path, ':s?[\\/]\=$??')
- let before = filter(pathogen#expand(path), '!pathogen#is_disabled(v:val)')
- let after = filter(reverse(pathogen#expand(path, sep.'after')), '!pathogen#is_disabled(v:val[0:-7])')
- call filter(rtp, 'index(before + after, v:val) == -1')
- let &rtp = pathogen#join(before, rtp, after)
- return &rtp
-endfunction
-
-" For each directory in the runtime path, add a second entry with the given
-" argument appended. Curly braces are expanded with pathogen#expand().
-function! pathogen#interpose(name) abort
- let sep = pathogen#slash()
- let name = a:name
- if has_key(s:done_bundles, name)
- return ""
- endif
- let s:done_bundles[name] = 1
- let list = []
- for dir in pathogen#split(&rtp)
- if dir =~# '\<after$'
- let list += reverse(filter(pathogen#expand(dir[0:-6].name, sep.'after'), '!pathogen#is_disabled(v:val[0:-7])')) + [dir]
- else
- let list += [dir] + filter(pathogen#expand(dir.sep.name), '!pathogen#is_disabled(v:val)')
- endif
- endfor
- let &rtp = pathogen#join(pathogen#uniq(list))
- return 1
-endfunction
-
-let s:done_bundles = {}
-
-" Invoke :helptags on all non-$VIM doc directories in runtimepath.
-function! pathogen#helptags() abort
- let sep = pathogen#slash()
- for glob in pathogen#split(&rtp)
- for dir in map(split(glob(glob), "\n"), 'v:val.sep."/doc/".sep')
- if (dir)[0 : strlen($VIMRUNTIME)] !=# $VIMRUNTIME.sep && filewritable(dir) == 2 && !empty(split(glob(dir.'*.txt'))) && (!filereadable(dir.'tags') || filewritable(dir.'tags'))
- silent! execute 'helptags' pathogen#fnameescape(dir)
- endif
- endfor
- endfor
-endfunction
-
-command! -bar Helptags :call pathogen#helptags()
-
-" Execute the given command. This is basically a backdoor for --remote-expr.
-function! pathogen#execute(...) abort
- for command in a:000
- execute command
- endfor
- return ''
-endfunction
-
-" Section: Unofficial
-
-function! pathogen#is_absolute(path) abort
- return a:path =~# (has('win32') ? '^\%([\\/]\|\w:\)[\\/]\|^[~$]' : '^[/~$]')
-endfunction
-
-" Given a string, returns all possible permutations of comma delimited braced
-" alternatives of that string. pathogen#expand('/{a,b}/{c,d}') yields
-" ['/a/c', '/a/d', '/b/c', '/b/d']. Empty braces are treated as a wildcard
-" and globbed. Actual globs are preserved.
-function! pathogen#expand(pattern, ...) abort
- let after = a:0 ? a:1 : ''
- if a:pattern =~# '{[^{}]\+}'
- let [pre, pat, post] = split(substitute(a:pattern, '\(.\{-\}\){\([^{}]\+\)}\(.*\)', "\\1\001\\2\001\\3", ''), "\001", 1)
- let found = map(split(pat, ',', 1), 'pre.v:val.post')
- let results = []
- for pattern in found
- call extend(results, pathogen#expand(pattern))
- endfor
- elseif a:pattern =~# '{}'
- let pat = matchstr(a:pattern, '^.*{}[^*]*\%($\|[\\/]\)')
- let post = a:pattern[strlen(pat) : -1]
- let results = map(split(glob(substitute(pat, '{}', '*', 'g')), "\n"), 'v:val.post')
- else
- let results = [a:pattern]
- endif
- let vf = pathogen#slash() . 'vimfiles'
- call map(results, 'v:val =~# "\\*" ? v:val.after : isdirectory(v:val.vf.after) ? v:val.vf.after : isdirectory(v:val.after) ? v:val.after : ""')
- return filter(results, '!empty(v:val)')
-endfunction
-
-" \ on Windows unless shellslash is set, / everywhere else.
-function! pathogen#slash() abort
- return !exists("+shellslash") || &shellslash ? '/' : '\'
-endfunction
-
-function! pathogen#separator() abort
- return pathogen#slash()
-endfunction
-
-" Convenience wrapper around glob() which returns a list.
-function! pathogen#glob(pattern) abort
- let files = split(glob(a:pattern),"\n")
- return map(files,'substitute(v:val,"[".pathogen#slash()."/]$","","")')
-endfunction
-
-" Like pathogen#glob(), only limit the results to directories.
-function! pathogen#glob_directories(pattern) abort
- return filter(pathogen#glob(a:pattern),'isdirectory(v:val)')
-endfunction
-
-" Remove duplicates from a list.
-function! pathogen#uniq(list) abort
- let i = 0
- let seen = {}
- while i < len(a:list)
- 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
- endif
- endwhile
- return a:list
-endfunction
-
-" Backport of fnameescape().
-function! pathogen#fnameescape(string) abort
- if exists('*fnameescape')
- return fnameescape(a:string)
- elseif a:string ==# '-'
- return '\-'
- else
- return substitute(escape(a:string," \t\n*?[{`$\\%#'\"|!<"),'^[+>]','\\&','')
- endif
-endfunction
-
-" Like findfile(), but hardcoded to use the runtimepath.
-function! pathogen#runtime_findfile(file,count) abort
- let rtp = pathogen#join(1,pathogen#split(&rtp))
- let file = findfile(a:file,rtp,a:count)
- if file ==# ''
- return ''
- else
- return fnamemodify(file,':p')
- endif
-endfunction
-
-" Section: Deprecated
-
-function! s:warn(msg) abort
- echohl WarningMsg
- echomsg a:msg
- echohl NONE
-endfunction
-
-" Prepend all subdirectories of path to the rtp, and append all 'after'
-" directories in those subdirectories. Deprecated.
-function! pathogen#runtime_prepend_subdirectories(path) abort
- call s:warn('Change pathogen#runtime_prepend_subdirectories('.string(a:path).') to pathogen#infect('.string(a:path.'/{}').')')
- return pathogen#surround(a:path . pathogen#slash() . '{}')
-endfunction
-
-function! pathogen#incubate(...) abort
- let name = a:0 ? a:1 : 'bundle/{}'
- call s:warn('Change pathogen#incubate('.(a:0 ? string(a:1) : '').') to pathogen#infect('.string(name).')')
- return pathogen#interpose(name)
-endfunction
-
-" Deprecated alias for pathogen#interpose().
-function! pathogen#runtime_append_all_bundles(...) abort
- if a:0
- call s:warn('Change pathogen#runtime_append_all_bundles('.string(a:1).') to pathogen#infect('.string(a:1.'/{}').')')
- else
- call s:warn('Change pathogen#runtime_append_all_bundles() to pathogen#infect()')
- endif
- return pathogen#interpose(a:0 ? a:1 . '/{}' : 'bundle/{}')
-endfunction
-
-if exists(':Vedit')
- finish
-endif
-
-let s:vopen_warning = 0
-
-function! s:find(count,cmd,file,lcd)
- 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'"
- endif
- if !s:vopen_warning
- let s:vopen_warning = 1
- let warning = '|echohl WarningMsg|echo "Install scriptease.vim to continue using :V'.a:cmd.'"|echohl NONE'
- else
- let warning = ''
- endif
- if a:lcd
- let path = file[0:-strlen(a:file)-2]
- execute 'lcd `=path`'
- return a:cmd.' '.pathogen#fnameescape(a:file) . warning
- else
- return a:cmd.' '.pathogen#fnameescape(file) . warning
- endif
-endfunction
-
-function! s:Findcomplete(A,L,P)
- let sep = pathogen#slash()
- 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
-
-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 et sw=2 foldmethod=expr foldexpr=getline(v\:lnum)=~'^\"\ Section\:'?'>1'\:getline(v\:lnum)=~#'^fu'?'a1'\:getline(v\:lnum)=~#'^endf'?'s1'\:'=':
diff --git a/vim/autoload/autoload/pathogen.vim b/vim/autoload/autoload/pathogen.vim
deleted file mode 100644
index 59a75c1..0000000
--- a/vim/autoload/autoload/pathogen.vim
+++ /dev/null
@@ -1,353 +0,0 @@
-" pathogen.vim - path option manipulation
-" Maintainer: Tim Pope <http://tpo.pe/>
-" Version: 2.4
-
-" Install in ~/.vim/autoload (or ~\vimfiles\autoload).
-"
-" For management of individually installed plugins in ~/.vim/bundle (or
-" ~\vimfiles\bundle), adding `execute pathogen#infect()` to the top of your
-" .vimrc is the only other setup necessary.
-"
-" The API is documented inline below.
-
-if exists("g:loaded_pathogen") || &cp
- finish
-endif
-let g:loaded_pathogen = 1
-
-" Point of entry for basic default usage. Give a relative path to invoke
-" pathogen#interpose() (defaults to "bundle/{}"), or an absolute path to invoke
-" pathogen#surround(). Curly braces are expanded with pathogen#expand():
-" "bundle/{}" finds all subdirectories inside "bundle" inside all directories
-" in the runtime path.
-function! pathogen#infect(...) abort
- for path in a:0 ? filter(reverse(copy(a:000)), 'type(v:val) == type("")') : ['bundle/{}']
- if path =~# '^\%({\=[$~\\/]\|{\=\w:[\\/]\).*[{}*]'
- call pathogen#surround(path)
- elseif path =~# '^\%([$~\\/]\|\w:[\\/]\)'
- call s:warn('Change pathogen#infect('.string(path).') to pathogen#infect('.string(path.'/{}').')')
- call pathogen#surround(path . '/{}')
- elseif path =~# '[{}*]'
- call pathogen#interpose(path)
- else
- call s:warn('Change pathogen#infect('.string(path).') to pathogen#infect('.string(path.'/{}').')')
- call pathogen#interpose(path . '/{}')
- endif
- endfor
- call pathogen#cycle_filetype()
- if pathogen#is_disabled($MYVIMRC)
- return 'finish'
- endif
- return ''
-endfunction
-
-" Split a path into a list.
-function! pathogen#split(path) abort
- if type(a:path) == type([]) | return a:path | endif
- if empty(a:path) | return [] | endif
- let split = split(a:path,'\\\@<!\%(\\\\\)*\zs,')
- return map(split,'substitute(v:val,''\\\([\\,]\)'',''\1'',"g")')
-endfunction
-
-" Convert a list to a path.
-function! pathogen#join(...) abort
- 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
-
-" Convert a list to a path with escaped spaces for 'path', 'tag', etc.
-function! pathogen#legacyjoin(...) abort
- return call('pathogen#join',[1] + a:000)
-endfunction
-
-" Turn filetype detection off and back on again if it was already enabled.
-function! pathogen#cycle_filetype() abort
- if exists('g:did_load_filetypes')
- filetype off
- filetype on
- endif
-endfunction
-
-" Check if a bundle is disabled. A bundle is considered disabled if its
-" basename or full name is included in the list g:pathogen_blacklist or the
-" comma delimited environment variable $VIMBLACKLIST.
-function! pathogen#is_disabled(path) abort
- if a:path =~# '\~$'
- return 1
- endif
- let sep = pathogen#slash()
- let blacklist =
- \ get(g:, 'pathogen_blacklist', get(g:, 'pathogen_disabled', [])) +
- \ pathogen#split($VIMBLACKLIST)
- if !empty(blacklist)
- call map(blacklist, 'substitute(v:val, "[\\/]$", "", "")')
- endif
- return index(blacklist, fnamemodify(a:path, ':t')) != -1 || index(blacklist, a:path) != -1
-endfunction
-
-" Prepend the given directory to the runtime path and append its corresponding
-" after directory. Curly braces are expanded with pathogen#expand().
-function! pathogen#surround(path) abort
- let sep = pathogen#slash()
- let rtp = pathogen#split(&rtp)
- let path = fnamemodify(a:path, ':s?[\\/]\=$??')
- let before = filter(pathogen#expand(path), '!pathogen#is_disabled(v:val)')
- let after = filter(reverse(pathogen#expand(path, sep.'after')), '!pathogen#is_disabled(v:val[0:-7])')
- call filter(rtp, 'index(before + after, v:val) == -1')
- let &rtp = pathogen#join(before, rtp, after)
- return &rtp
-endfunction
-
-" For each directory in the runtime path, add a second entry with the given
-" argument appended. Curly braces are expanded with pathogen#expand().
-function! pathogen#interpose(name) abort
- let sep = pathogen#slash()
- let name = a:name
- if has_key(s:done_bundles, name)
- return ""
- endif
- let s:done_bundles[name] = 1
- let list = []
- for dir in pathogen#split(&rtp)
- if dir =~# '\<after$'
- let list += reverse(filter(pathogen#expand(dir[0:-6].name, sep.'after'), '!pathogen#is_disabled(v:val[0:-7])')) + [dir]
- else
- let list += [dir] + filter(pathogen#expand(dir.sep.name), '!pathogen#is_disabled(v:val)')
- endif
- endfor
- let &rtp = pathogen#join(pathogen#uniq(list))
- return 1
-endfunction
-
-let s:done_bundles = {}
-
-" Invoke :helptags on all non-$VIM doc directories in runtimepath.
-function! pathogen#helptags() abort
- let sep = pathogen#slash()
- for glob in pathogen#split(&rtp)
- for dir in map(split(glob(glob), "\n"), 'v:val.sep."/doc/".sep')
- if (dir)[0 : strlen($VIMRUNTIME)] !=# $VIMRUNTIME.sep && filewritable(dir) == 2 && !empty(split(glob(dir.'*.txt'))) && (!filereadable(dir.'tags') || filewritable(dir.'tags'))
- silent! execute 'helptags' pathogen#fnameescape(dir)
- endif
- endfor
- endfor
-endfunction
-
-command! -bar Helptags :call pathogen#helptags()
-
-" Execute the given command. This is basically a backdoor for --remote-expr.
-function! pathogen#execute(...) abort
- for command in a:000
- execute command
- endfor
- return ''
-endfunction
-
-" Section: Unofficial
-
-function! pathogen#is_absolute(path) abort
- return a:path =~# (has('win32') ? '^\%([\\/]\|\w:\)[\\/]\|^[~$]' : '^[/~$]')
-endfunction
-
-" Given a string, returns all possible permutations of comma delimited braced
-" alternatives of that string. pathogen#expand('/{a,b}/{c,d}') yields
-" ['/a/c', '/a/d', '/b/c', '/b/d']. Empty braces are treated as a wildcard
-" and globbed. Actual globs are preserved.
-function! pathogen#expand(pattern, ...) abort
- let after = a:0 ? a:1 : ''
- if a:pattern =~# '{[^{}]\+}'
- let [pre, pat, post] = split(substitute(a:pattern, '\(.\{-\}\){\([^{}]\+\)}\(.*\)', "\\1\001\\2\001\\3", ''), "\001", 1)
- let found = map(split(pat, ',', 1), 'pre.v:val.post')
- let results = []
- for pattern in found
- call extend(results, pathogen#expand(pattern))
- endfor
- elseif a:pattern =~# '{}'
- let pat = matchstr(a:pattern, '^.*{}[^*]*\%($\|[\\/]\)')
- let post = a:pattern[strlen(pat) : -1]
- let results = map(split(glob(substitute(pat, '{}', '*', 'g')), "\n"), 'v:val.post')
- else
- let results = [a:pattern]
- endif
- let vf = pathogen#slash() . 'vimfiles'
- call map(results, 'v:val =~# "\\*" ? v:val.after : isdirectory(v:val.vf.after) ? v:val.vf.after : isdirectory(v:val.after) ? v:val.after : ""')
- return filter(results, '!empty(v:val)')
-endfunction
-
-" \ on Windows unless shellslash is set, / everywhere else.
-function! pathogen#slash() abort
- return !exists("+shellslash") || &shellslash ? '/' : '\'
-endfunction
-
-function! pathogen#separator() abort
- return pathogen#slash()
-endfunction
-
-" Convenience wrapper around glob() which returns a list.
-function! pathogen#glob(pattern) abort
- let files = split(glob(a:pattern),"\n")
- return map(files,'substitute(v:val,"[".pathogen#slash()."/]$","","")')
-endfunction
-
-" Like pathogen#glob(), only limit the results to directories.
-function! pathogen#glob_directories(pattern) abort
- return filter(pathogen#glob(a:pattern),'isdirectory(v:val)')
-endfunction
-
-" Remove duplicates from a list.
-function! pathogen#uniq(list) abort
- let i = 0
- let seen = {}
- while i < len(a:list)
- 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
- endif
- endwhile
- return a:list
-endfunction
-
-" Backport of fnameescape().
-function! pathogen#fnameescape(string) abort
- if exists('*fnameescape')
- return fnameescape(a:string)
- elseif a:string ==# '-'
- return '\-'
- else
- return substitute(escape(a:string," \t\n*?[{`$\\%#'\"|!<"),'^[+>]','\\&','')
- endif
-endfunction
-
-" Like findfile(), but hardcoded to use the runtimepath.
-function! pathogen#runtime_findfile(file,count) abort
- let rtp = pathogen#join(1,pathogen#split(&rtp))
- let file = findfile(a:file,rtp,a:count)
- if file ==# ''
- return ''
- else
- return fnamemodify(file,':p')
- endif
-endfunction
-
-" Section: Deprecated
-
-function! s:warn(msg) abort
- echohl WarningMsg
- echomsg a:msg
- echohl NONE
-endfunction
-
-" Prepend all subdirectories of path to the rtp, and append all 'after'
-" directories in those subdirectories. Deprecated.
-function! pathogen#runtime_prepend_subdirectories(path) abort
- call s:warn('Change pathogen#runtime_prepend_subdirectories('.string(a:path).') to pathogen#infect('.string(a:path.'/{}').')')
- return pathogen#surround(a:path . pathogen#slash() . '{}')
-endfunction
-
-function! pathogen#incubate(...) abort
- let name = a:0 ? a:1 : 'bundle/{}'
- call s:warn('Change pathogen#incubate('.(a:0 ? string(a:1) : '').') to pathogen#infect('.string(name).')')
- return pathogen#interpose(name)
-endfunction
-
-" Deprecated alias for pathogen#interpose().
-function! pathogen#runtime_append_all_bundles(...) abort
- if a:0
- call s:warn('Change pathogen#runtime_append_all_bundles('.string(a:1).') to pathogen#infect('.string(a:1.'/{}').')')
- else
- call s:warn('Change pathogen#runtime_append_all_bundles() to pathogen#infect()')
- endif
- return pathogen#interpose(a:0 ? a:1 . '/{}' : 'bundle/{}')
-endfunction
-
-if exists(':Vedit')
- finish
-endif
-
-let s:vopen_warning = 0
-
-function! s:find(count,cmd,file,lcd)
- 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'"
- endif
- if !s:vopen_warning
- let s:vopen_warning = 1
- let warning = '|echohl WarningMsg|echo "Install scriptease.vim to continue using :V'.a:cmd.'"|echohl NONE'
- else
- let warning = ''
- endif
- if a:lcd
- let path = file[0:-strlen(a:file)-2]
- execute 'lcd `=path`'
- return a:cmd.' '.pathogen#fnameescape(a:file) . warning
- else
- return a:cmd.' '.pathogen#fnameescape(file) . warning
- endif
-endfunction
-
-function! s:Findcomplete(A,L,P)
- let sep = pathogen#slash()
- 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
-
-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 et sw=2 foldmethod=expr foldexpr=getline(v\:lnum)=~'^\"\ Section\:'?'>1'\:getline(v\:lnum)=~#'^fu'?'a1'\:getline(v\:lnum)=~#'^endf'?'s1'\:'=':
diff --git a/vim/autoload/pathogen.vim b/vim/autoload/pathogen.vim
index a13ae08..59a75c1 100644
--- a/vim/autoload/pathogen.vim
+++ b/vim/autoload/pathogen.vim
@@ -1,6 +1,6 @@
" pathogen.vim - path option manipulation
" Maintainer: Tim Pope <http://tpo.pe/>
-" Version: 2.3
+" Version: 2.4
" Install in ~/.vim/autoload (or ~\vimfiles\autoload).
"
@@ -90,27 +90,30 @@ function! pathogen#cycle_filetype() abort
endfunction
" Check if a bundle is disabled. A bundle is considered disabled if its
-" basename or full name is included in the list g:pathogen_disabled.
+" basename or full name is included in the list g:pathogen_blacklist or the
+" comma delimited environment variable $VIMBLACKLIST.
function! pathogen#is_disabled(path) abort
if a:path =~# '\~$'
return 1
endif
let sep = pathogen#slash()
- let blacklist = map(
+ let blacklist =
\ get(g:, 'pathogen_blacklist', get(g:, 'pathogen_disabled', [])) +
- \ pathogen#split($VIMBLACKLIST),
- \ 'substitute(v:val, "[\\/]$", "", "")')
+ \ pathogen#split($VIMBLACKLIST)
+ if !empty(blacklist)
+ call map(blacklist, 'substitute(v:val, "[\\/]$", "", "")')
+ endif
return index(blacklist, fnamemodify(a:path, ':t')) != -1 || index(blacklist, a:path) != -1
-endfunction "}}}1
+endfunction
" Prepend the given directory to the runtime path and append its corresponding
" after directory. Curly braces are expanded with pathogen#expand().
function! pathogen#surround(path) abort
let sep = pathogen#slash()
let rtp = pathogen#split(&rtp)
- let path = fnamemodify(a:path, ':p:?[\\/]\=$??')
+ let path = fnamemodify(a:path, ':s?[\\/]\=$??')
let before = filter(pathogen#expand(path), '!pathogen#is_disabled(v:val)')
- let after = filter(reverse(pathogen#expand(path.sep.'after')), '!pathogen#is_disabled(v:val[0:-7])')
+ let after = filter(reverse(pathogen#expand(path, sep.'after')), '!pathogen#is_disabled(v:val[0:-7])')
call filter(rtp, 'index(before + after, v:val) == -1')
let &rtp = pathogen#join(before, rtp, after)
return &rtp
@@ -128,7 +131,7 @@ function! pathogen#interpose(name) abort
let list = []
for dir in pathogen#split(&rtp)
if dir =~# '\<after$'
- let list += reverse(filter(pathogen#expand(dir[0:-6].name.sep.'after'), '!pathogen#is_disabled(v:val[0:-7])')) + [dir]
+ let list += reverse(filter(pathogen#expand(dir[0:-6].name, sep.'after'), '!pathogen#is_disabled(v:val[0:-7])')) + [dir]
else
let list += [dir] + filter(pathogen#expand(dir.sep.name), '!pathogen#is_disabled(v:val)')
endif
@@ -171,7 +174,8 @@ endfunction
" alternatives of that string. pathogen#expand('/{a,b}/{c,d}') yields
" ['/a/c', '/a/d', '/b/c', '/b/d']. Empty braces are treated as a wildcard
" and globbed. Actual globs are preserved.
-function! pathogen#expand(pattern) abort
+function! pathogen#expand(pattern, ...) abort
+ let after = a:0 ? a:1 : ''
if a:pattern =~# '{[^{}]\+}'
let [pre, pat, post] = split(substitute(a:pattern, '\(.\{-\}\){\([^{}]\+\)}\(.*\)', "\\1\001\\2\001\\3", ''), "\001", 1)
let found = map(split(pat, ',', 1), 'pre.v:val.post')
@@ -179,14 +183,16 @@ function! pathogen#expand(pattern) abort
for pattern in found
call extend(results, pathogen#expand(pattern))
endfor
- return results
elseif a:pattern =~# '{}'
let pat = matchstr(a:pattern, '^.*{}[^*]*\%($\|[\\/]\)')
let post = a:pattern[strlen(pat) : -1]
- return map(split(glob(substitute(pat, '{}', '*', 'g')), "\n"), 'v:val.post')
+ let results = map(split(glob(substitute(pat, '{}', '*', 'g')), "\n"), 'v:val.post')
else
- return [a:pattern]
+ let results = [a:pattern]
endif
+ let vf = pathogen#slash() . 'vimfiles'
+ call map(results, 'v:val =~# "\\*" ? v:val.after : isdirectory(v:val.vf.after) ? v:val.vf.after : isdirectory(v:val.after) ? v:val.after : ""')
+ return filter(results, '!empty(v:val)')
endfunction
" \ on Windows unless shellslash is set, / everywhere else.
@@ -202,12 +208,12 @@ endfunction
function! pathogen#glob(pattern) abort
let files = split(glob(a:pattern),"\n")
return map(files,'substitute(v:val,"[".pathogen#slash()."/]$","","")')
-endfunction "}}}1
+endfunction
" Like pathogen#glob(), only limit the results to directories.
function! pathogen#glob_directories(pattern) abort
return filter(pathogen#glob(a:pattern),'isdirectory(v:val)')
-endfunction "}}}1
+endfunction
" Remove duplicates from a list.
function! pathogen#uniq(list) abort
@@ -239,7 +245,7 @@ function! pathogen#fnameescape(string) abort
endfunction
" Like findfile(), but hardcoded to use the runtimepath.
-function! pathogen#runtime_findfile(file,count) abort "{{{1
+function! pathogen#runtime_findfile(file,count) abort
let rtp = pathogen#join(1,pathogen#split(&rtp))
let file = findfile(a:file,rtp,a:count)
if file ==# ''