summaryrefslogtreecommitdiff
path: root/runtime/syntax/yaml.vim
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2013-09-05 22:13:31 +0200
committerBram Moolenaar <Bram@vim.org>2013-09-05 22:13:31 +0200
commit7cba6c0636191af353430c5a49b514692fa259ac (patch)
tree6ad8420c61e27d1fd77d4ecdcd632b957c2e1f15 /runtime/syntax/yaml.vim
parentbec9c20884290cc64e63d4eec531c0a2fbdcd3f6 (diff)
downloadvim-git-7cba6c0636191af353430c5a49b514692fa259ac.tar.gz
Updated runtime files.
Diffstat (limited to 'runtime/syntax/yaml.vim')
-rw-r--r--runtime/syntax/yaml.vim5
1 files changed, 3 insertions, 2 deletions
diff --git a/runtime/syntax/yaml.vim b/runtime/syntax/yaml.vim
index 1e54aff38..073dbf741 100644
--- a/runtime/syntax/yaml.vim
+++ b/runtime/syntax/yaml.vim
@@ -108,9 +108,10 @@ execute 'syn match yamlFlowMappingKey /'.s:ns_plain_in.'\ze\s*:/ contained '.
syn match yamlFlowMappingMerge /<<\ze\s*:/ contained nextgroup=yamlKeyValueDelimiter
syn match yamlBlockCollectionItemStart '^\s*\zs-\%(\s\+-\)*\s' nextgroup=yamlBlockMappingKey,yamlBlockMappingMerge
-execute 'syn match yamlBlockMappingKey /^\s*\zs'.s:ns_plain_out.'\ze\s*:\%(\s\|$\)/ '.
+" Use the old regexp engine, the NFA engine doesn't like all the \@ items.
+execute 'syn match yamlBlockMappingKey /\%#=1^\s*\zs'.s:ns_plain_out.'\ze\s*:\%(\s\|$\)/ '.
\'nextgroup=yamlKeyValueDelimiter'
-execute 'syn match yamlBlockMappingKey /\s*\zs'.s:ns_plain_out.'\ze\s*:\%(\s\|$\)/ contained '.
+execute 'syn match yamlBlockMappingKey /\%#=1\s*\zs'.s:ns_plain_out.'\ze\s*:\%(\s\|$\)/ contained '.
\'nextgroup=yamlKeyValueDelimiter'
syn match yamlBlockMappingMerge /^\s*\zs<<\ze:\%(\s\|$\)/ nextgroup=yamlKeyValueDelimiter
syn match yamlBlockMappingMerge /<<\ze\s*:\%(\s\|$\)/ nextgroup=yamlKeyValueDelimiter contained