aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Makefile8
-rw-r--r--vim/vimrc5
2 files changed, 6 insertions, 7 deletions
diff --git a/Makefile b/Makefile
index f2da32ce..74ebd0f4 100644
--- a/Makefile
+++ b/Makefile
@@ -40,7 +40,6 @@
install-vim-config \
install-vim-gui \
install-vim-gui-config \
- install-vim-pathogen \
install-vim-plugins \
install-wget \
install-x \
@@ -464,8 +463,7 @@ install-urxvt: urxvt/ext/select
-exec cp -p -- {} $(HOME)/.urxvt/ext \;
install-vim: install-vim-config \
- install-vim-plugins \
- install-vim-pathogen
+ install-vim-plugins
install-vim-config:
mkdir -p -- $(HOME)/.vim/config
@@ -483,10 +481,6 @@ install-vim-plugins: install-vim-config
-type d -exec sh -c 'mkdir -p -- $(HOME)/."$$1"' _ {} \; -o \
-type f -exec sh -c 'cp -p -- "$$1" $(HOME)/."$$1"' _ {} \;
-install-vim-pathogen: install-vim-plugins
- mkdir -p -- $(HOME)/.vim/autoload
- ln -fs -- ../bundle/pathogen/autoload/pathogen.vim $(HOME)/.vim/autoload
-
install-wget:
cp -p -- wget/wgetrc $(HOME)/.wgetrc
diff --git a/vim/vimrc b/vim/vimrc
index a5849694..7a67c2c4 100644
--- a/vim/vimrc
+++ b/vim/vimrc
@@ -14,6 +14,11 @@ runtime! config/*.vim
" If our version isn't ancient and Pathogen is available, call it to load all
" the plugins in .vim/bundle; these are saved as submodules
if v:version >= 701
+
+ " Bootstrap Pathogen
+ runtime bundle/pathogen/autoload/pathogen.vim
+
+ " Run Pathogen to broaden 'realtimepath' for plugin code and help tags
silent! call pathogen#infect()
silent! call pathogen#helptags()