aboutsummaryrefslogtreecommitdiff
path: root/vim
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 /vim
parentMerge branch 'release/v2.4.0' (diff)
parentBump VERSION (diff)
downloaddotfiles-3fac0e901c0c96b571c46a29bd392c23ceaaeaf2.tar.gz
dotfiles-3fac0e901c0c96b571c46a29bd392c23ceaaeaf2.zip
Merge branch 'release/v2.5.0'v2.5.0
* release/v2.5.0: Bump VERSION Restore filetype.vim shortcircuit
Diffstat (limited to 'vim')
-rw-r--r--vim/filetype.vim4
1 files changed, 2 insertions, 2 deletions
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