diff options
| author | Josh Rahm <rahm@google.com> | 2022-10-11 19:10:36 +0000 |
|---|---|---|
| committer | Josh Rahm <rahm@google.com> | 2022-10-11 19:10:36 +0000 |
| commit | ad86b5db74922285699ab2a1dbb2ff20e6268a33 (patch) | |
| tree | 6fbfa163656252307d6069525896917eab956c74 /runtime/syntax/syntax.vim | |
| parent | 242f75745009b3a0a2108d98ce6c02b6e13aac3f (diff) | |
| parent | 760b399f6c0c6470daa0663752bd22886997f9e6 (diff) | |
| download | rneovim-ad86b5db74922285699ab2a1dbb2ff20e6268a33.tar.gz rneovim-ad86b5db74922285699ab2a1dbb2ff20e6268a33.tar.bz2 rneovim-ad86b5db74922285699ab2a1dbb2ff20e6268a33.zip | |
Merge remote-tracking branch 'upstream/master' into userreg
Diffstat (limited to 'runtime/syntax/syntax.vim')
| -rw-r--r-- | runtime/syntax/syntax.vim | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/runtime/syntax/syntax.vim b/runtime/syntax/syntax.vim index ac7dc314b9..5ec99c7e05 100644 --- a/runtime/syntax/syntax.vim +++ b/runtime/syntax/syntax.vim @@ -27,12 +27,13 @@ else endif " Set up the connection between FileType and Syntax autocommands. -" This makes the syntax automatically set when the file type is detected. +" This makes the syntax automatically set when the file type is detected +" unless treesitter highlighting is enabled. +" Avoid an error when 'verbose' is set and <amatch> expansion fails. augroup syntaxset - au! FileType * exe "set syntax=" . expand("<amatch>") + au! FileType * if !exists('b:ts_highlight') | 0verbose exe "set syntax=" . expand("<amatch>") | endif augroup END - " Execute the syntax autocommands for the each buffer. " If the filetype wasn't detected yet, do that now. " Always do the syntaxset autocommands, for buffers where the 'filetype' |