From 98b6394a7cbb64e411ead56deced969d3222db33 Mon Sep 17 00:00:00 2001 From: Curtis McEnroe Date: Tue, 4 Jul 2017 22:23:23 -0400 Subject: Remove pathogen Apparently this is built in now. Except it loads from a weird path structure. --- curtis/.config/nvim/autoload/pathogen.vim | 289 ------------------------------ curtis/.config/nvim/init.vim | 2 - vendor.sh | 12 -- 3 files changed, 303 deletions(-) delete mode 100644 curtis/.config/nvim/autoload/pathogen.vim delete mode 100755 vendor.sh diff --git a/curtis/.config/nvim/autoload/pathogen.vim b/curtis/.config/nvim/autoload/pathogen.vim deleted file mode 100644 index dbe07f00..00000000 --- a/curtis/.config/nvim/autoload/pathogen.vim +++ /dev/null @@ -1,289 +0,0 @@ -" pathogen.vim - path option manipulation -" Maintainer: Tim Pope -" 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,'\\\@]','\\&','') - 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 - -" 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/curtis/.config/nvim/init.vim b/curtis/.config/nvim/init.vim index e4dfb744..99808cce 100644 --- a/curtis/.config/nvim/init.vim +++ b/curtis/.config/nvim/init.vim @@ -32,5 +32,3 @@ noremap K N noremap J E nmap n j nmap e k - -execute pathogen#infect() diff --git a/vendor.sh b/vendor.sh deleted file mode 100755 index 2e228e54..00000000 --- a/vendor.sh +++ /dev/null @@ -1,12 +0,0 @@ -#!/usr/bin/env zsh - -# Pull latest versions of vendored files. - -set -o errexit -o nounset -o pipefail - -pull() { - curl -s "https://raw.githubusercontent.com/$2" -o "$1" - echo "$1" -} - -pull {curtis/.config/nvim,tpope/vim-pathogen/master}/autoload/pathogen.vim -- cgit 1.4.1