aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Ryder <tom@sanctum.geek.nz>2018-11-30 14:21:49 +1300
committerTom Ryder <tom@sanctum.geek.nz>2018-11-30 14:21:49 +1300
commit8b25f7cc15676ccbb54cb424cd8b93d9b0a6d02d (patch)
treece05c24229a95084b4288a7ae380aa3e2f8c134a
parentMerge branch 'release/v2.2.0' (diff)
parentBump VERSION (diff)
downloaddotfiles-8b25f7cc15676ccbb54cb424cd8b93d9b0a6d02d.tar.gz
dotfiles-8b25f7cc15676ccbb54cb424cd8b93d9b0a6d02d.zip
Merge branch 'release/v2.3.0'v2.3.0
* release/v2.3.0: Bump VERSION Don't load my filetype.vim if Vim is too old
-rw-r--r--VERSION4
-rw-r--r--vim/filetype.vim4
2 files changed, 4 insertions, 4 deletions
diff --git a/VERSION b/VERSION
index 85f95d68..a4da619e 100644
--- a/VERSION
+++ b/VERSION
@@ -1,2 +1,2 @@
-tejr dotfiles v2.2.0
-Fri Nov 30 01:17:01 UTC 2018
+tejr dotfiles v2.3.0
+Fri Nov 30 01:21:49 UTC 2018
diff --git a/vim/filetype.vim b/vim/filetype.vim
index 2e20b744..cc0de4e4 100644
--- a/vim/filetype.vim
+++ b/vim/filetype.vim
@@ -1,5 +1,5 @@
-" Override system filetype.vim
-if exists('g:did_load_filetypes')
+" Override system filetype.vim if sufficiently new
+if exists('g:did_load_filetypes') || v:version < 700
finish
endif
let g:did_load_filetypes = 1