summaryrefslogtreecommitdiffstats
path: root/runtime/syntax
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2022-04-12 14:23:19 +0100
committerBram Moolenaar <Bram@vim.org>2022-04-12 14:23:19 +0100
commit60895f3e36def9beb7d5463e792e5154ad9a7a0a (patch)
treee27a7746b43c278eb9ec66ef3a23086cf34a75bd /runtime/syntax
parent575445200bd35283191ecd7a0d596b37c5b477a4 (diff)
patch 8.2.4741: startup test failsv8.2.4741
Problem: Startup test fails. Solution: Avoid an error for verbose expansion. Fix that the "0verbose" command modifier doesn't work.
Diffstat (limited to 'runtime/syntax')
-rw-r--r--runtime/syntax/synload.vim2
-rw-r--r--runtime/syntax/syntax.vim3
2 files changed, 3 insertions, 2 deletions
diff --git a/runtime/syntax/synload.vim b/runtime/syntax/synload.vim
index f373161c7c..728b653d8e 100644
--- a/runtime/syntax/synload.vim
+++ b/runtime/syntax/synload.vim
@@ -37,7 +37,7 @@ fun! s:SynSet()
unlet b:current_syntax
endif
- let s = expand("<amatch>")
+ 0verbose let s = expand("<amatch>")
if s == "ON"
" :set syntax=ON
if &filetype == ""
diff --git a/runtime/syntax/syntax.vim b/runtime/syntax/syntax.vim
index f274d93f4f..4cb02887a1 100644
--- a/runtime/syntax/syntax.vim
+++ b/runtime/syntax/syntax.vim
@@ -28,8 +28,9 @@ endif
" Set up the connection between FileType and Syntax autocommands.
" This makes the syntax automatically set when the file type is detected.
+" Avoid an error when 'verbose' is set and <amatch> expansion fails.
augroup syntaxset
- au! FileType * exe "set syntax=" . expand("<amatch>")
+ au! FileType * 0verbose exe "set syntax=" . expand("<amatch>")
augroup END