aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Ryder <tom@sanctum.geek.nz>2018-06-30 20:36:07 +1200
committerTom Ryder <tom@sanctum.geek.nz>2018-06-30 20:36:07 +1200
commit40c1e1ace9531ae11f44dde2b893dfd6fae0cc3c (patch)
tree985299bffb7f8df34ec22171abdc54ce14fe9364
parent280e9fffa44ad1b6cce5f7234ed770665cdc3ad4 (diff)
downloaddotfiles-40c1e1ace9531ae11f44dde2b893dfd6fae0cc3c.tar.gz
Start using ~/.vim/vimrc as vimrc path
This conveniently enables filtering out truly ancient Vims.
-rw-r--r--Makefile5
-rw-r--r--vim/stub.vimrc4
2 files changed, 7 insertions, 2 deletions
diff --git a/Makefile b/Makefile
index 4f8b867b..f986416f 100644
--- a/Makefile
+++ b/Makefile
@@ -542,7 +542,8 @@ install-vim-compiler:
cp -p -- vim/compiler/*.vim $(VIMDIR)/compiler
install-vim-config:
- cp -p -- vim/vimrc $(VIMRC)
+ cp -p -- vim/vimrc $(VIMDIR)/vimrc
+ cp -p -- vim/stub.vimrc $(VIMRC)
install-vim-filetype:
cp -p -- vim/filetype.vim vim/scripts.vim $(VIMDIR)
@@ -555,7 +556,7 @@ install-vim-gui: install-vim \
install-vim-gui-config
install-vim-gui-config:
- cp -p -- vim/gvimrc $(HOME)/.gvimrc
+ cp -p -- vim/gvimrc $(VIMDIR)/gvimrc
install-vim-indent:
mkdir -p -- $(VIMDIR)/indent
diff --git a/vim/stub.vimrc b/vim/stub.vimrc
new file mode 100644
index 00000000..a0111291
--- /dev/null
+++ b/vim/stub.vimrc
@@ -0,0 +1,4 @@
+" If not running truly ancient Vim, run my real vimrc
+if v:version >= 600
+ runtime vimrc
+endif