diff options
| author | Tom Ryder <tom@sanctum.geek.nz> | 2018-01-21 23:39:36 +1300 |
|---|---|---|
| committer | Tom Ryder <tom@sanctum.geek.nz> | 2018-01-21 23:39:36 +1300 |
| commit | 680c5b2b58db2d6fea59de3443e38aa3dffe0914 (patch) | |
| tree | f9ec628dab5549e5a996fce55428624e93a75b81 /vim/config/syntax.vim | |
| parent | Merge branch 'release/v0.24.0' (diff) | |
| parent | Bump version number to 0.25.0 (diff) | |
| download | dotfiles-0.25.0.tar.gz (sig) dotfiles-0.25.0.zip | |
Merge branch 'release/v0.25.0'v0.25.0
* release/v0.25.0:
Bump version number to 0.25.0
Suspend 'C' from 'cpoptions' for sh syn extensions
Join short-circuit line in detect_background.vim
Break some continued lines in Vim indent files
Remove 'mac' from 'fileformats'
Tweak 'cpoptions' C flag instead of 'nocompatible'
Remove a baseless assertion I made in a config
Make entire syntax config dependent on load state
Activate syntax settings conditionally
Diffstat (limited to 'vim/config/syntax.vim')
| -rw-r--r-- | vim/config/syntax.vim | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/vim/config/syntax.vim b/vim/config/syntax.vim index b493c0a9..00004e35 100644 --- a/vim/config/syntax.vim +++ b/vim/config/syntax.vim @@ -1,5 +1,5 @@ " Options dependent on the syntax feature -if has('syntax') +if has('syntax') && !has('g:syntax_on') " Use syntax highlighting with 100 lines of context silent! syntax enable |