aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Ryder <tom@sanctum.geek.nz>2018-11-30 14:30:00 +1300
committerTom Ryder <tom@sanctum.geek.nz>2018-11-30 14:30:00 +1300
commit3fac0e901c0c96b571c46a29bd392c23ceaaeaf2 (patch)
tree37cc02e4fa6240c6f178d0768b713974b98c04ac
parent6bc6744f0a42ed7ae04bdbf3c58bb11e770c0ac1 (diff)
parentf809b3dc95a6c0aa2c579c0a9b34f40f23fa65c4 (diff)
downloaddotfiles-3fac0e901c0c96b571c46a29bd392c23ceaaeaf2.tar.gz
Merge branch 'release/v2.5.0'v2.5.0
* release/v2.5.0: Bump VERSION Restore filetype.vim shortcircuit
-rw-r--r--VERSION4
-rw-r--r--vim/filetype.vim4
2 files changed, 4 insertions, 4 deletions
diff --git a/VERSION b/VERSION
index 6b1703dc..a7367f3b 100644
--- a/VERSION
+++ b/VERSION
@@ -1,2 +1,2 @@
-tejr dotfiles v2.4.0
-Fri Nov 30 01:28:53 UTC 2018
+tejr dotfiles v2.5.0
+Fri Nov 30 01:30:00 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