diff options
author | Tom Ryder <tom@sanctum.geek.nz> | 2018-06-06 20:41:37 +1200 |
---|---|---|
committer | Tom Ryder <tom@sanctum.geek.nz> | 2018-06-06 20:41:37 +1200 |
commit | 40809d9a4f41225c83b855e64fafb633aa72df2e (patch) | |
tree | 756f48eac3a7410778dba6ab9b581fd5367f8469 | |
parent | Remove vestigial comment from .vimrc (diff) | |
parent | Bump VERSION (diff) | |
download | dotfiles-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-- | VERSION | 4 | ||||
-rw-r--r-- | vim/filetype.vim | 3 |
2 files changed, 5 insertions, 2 deletions
@@ -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 |