diff options
author | Tom Ryder <tom@sanctum.geek.nz> | 2018-11-29 23:57:13 +1300 |
---|---|---|
committer | Tom Ryder <tom@sanctum.geek.nz> | 2018-11-30 00:01:12 +1300 |
commit | 7fed281d49ee41a15a1c2c6e9d565e264a0abf1d (patch) | |
tree | 98c4804cb25a2832a296e10d45ffe3d03766115c /vim | |
parent | Simplify a load guard for sh.vim syntax tweaks (diff) | |
download | dotfiles-7fed281d49ee41a15a1c2c6e9d565e264a0abf1d.tar.gz dotfiles-7fed281d49ee41a15a1c2c6e9d565e264a0abf1d.zip |
Require Vim 7 for filetype and syntax highlights
It's time!
The rest of the vimrc can probably be allowed to load, though.
Diffstat (limited to 'vim')
-rw-r--r-- | vim/after/syntax/sh.vim | 5 | ||||
-rw-r--r-- | vim/filetype.vim | 9 | ||||
-rw-r--r-- | vim/vimrc | 4 |
3 files changed, 5 insertions, 13 deletions
diff --git a/vim/after/syntax/sh.vim b/vim/after/syntax/sh.vim index 872d659c..bdedaf65 100644 --- a/vim/after/syntax/sh.vim +++ b/vim/after/syntax/sh.vim @@ -1,8 +1,3 @@ -" Don't try to make these corrections if the runtime files are too old -if v:version < 700 - finish -endif - " Remove g:is_posix if we resorted to it in order to get correct POSIX sh " highlighting with older Vim runtime files if exists('g:is_posix') diff --git a/vim/filetype.vim b/vim/filetype.vim index 4f3839ef..2e20b744 100644 --- a/vim/filetype.vim +++ b/vim/filetype.vim @@ -566,11 +566,8 @@ augroup filetypedetect \| runtime scripts.vim \|endif - " If supported, on leaving insert mode, check whether the first line was - " changed and looks like a shebang format, and if so, re-run filetype - " detection - if v:version > 700 - autocmd InsertLeave * call s:CheckShebang() - endif + " On leaving insert mode, check whether the first line was changed and looks + " like a shebang format, and if so, re-run filetype detection + autocmd InsertLeave * call s:CheckShebang() augroup END @@ -8,13 +8,13 @@ runtime system.vim " Load filetype settings, plugins, and maps -if has('autocmd') +if has('autocmd') && v:version >= 700 let g:maplocalleader = ',' filetype plugin indent on endif " Options dependent on the syntax feature -if has('syntax') +if has('syntax') && v:version >= 700 " Use syntax highlighting if !exists('g:syntax_on') |