aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Ryder <tom@sanctum.geek.nz>2018-06-06 20:41:37 +1200
committerTom Ryder <tom@sanctum.geek.nz>2018-06-06 20:41:37 +1200
commit40809d9a4f41225c83b855e64fafb633aa72df2e (patch)
tree756f48eac3a7410778dba6ab9b581fd5367f8469
parentRemove vestigial comment from .vimrc (diff)
parentBump VERSION (diff)
downloaddotfiles-40809d9a4f41225c83b855e64fafb633aa72df2e.tar.gz
dotfiles-40809d9a4f41225c83b855e64fafb633aa72df2e.zip
Merge branch 'hotfix/v0.48.1' into develop
* hotfix/v0.48.1: Bump VERSION Add compatibility guard to filetype.vim
-rw-r--r--VERSION4
-rw-r--r--vim/filetype.vim3
2 files changed, 5 insertions, 2 deletions
diff --git a/VERSION b/VERSION
index af53a290..81062e5d 100644
--- a/VERSION
+++ b/VERSION
@@ -1,2 +1,2 @@
-tejr dotfiles v0.48.0
-Wed Jun 6 06:03:56 UTC 2018
+tejr dotfiles v0.48.1
+Wed Jun 6 06:09:59 UTC 2018
diff --git a/vim/filetype.vim b/vim/filetype.vim
index a76321a2..ccb38ca3 100644
--- a/vim/filetype.vim
+++ b/vim/filetype.vim
@@ -3,6 +3,9 @@ if exists('g:did_load_filetypes')
finish
endif
let g:did_load_filetypes = 1
+if !has('autocmd') || &compatible
+ finish
+endif
" Use our own filetype detection rules
augroup filetypedetect