From 0d3f17a6c317b26cdc319b48e25e1574f3a0e9fd Mon Sep 17 00:00:00 2001
From: Sean Dewar <seandewar@users.noreply.github.com>
Date: Sun, 8 May 2022 10:15:36 +0100
Subject: vim-patch:partial:d899e5112079 (#18474)

Update runtime files
https://github.com/vim/vim/commit/d899e51120798d3fb5420abb1f19dddf3f014d05

- Skip vimhelp.vim stuff (syntax/help.vim, syntax.txt; v8.2.4891).
- Skip :let heredoc eval stuff (eval.txt; v8.2.4770).
- Skip uk.cp1251.po.
- Skip `*hl-CurSearch*` change (syntax.txt):
  - Vim's CurSearch works differently (Nvim's uses current cursor pos).
    Dunno know how applicable the redrawing comment is to Nvim...
  - Might be preferred to move it under `*hl-Search*` like Vim?
---
 runtime/indent/testdir/yaml.in | 5 -----
 runtime/indent/testdir/yaml.ok | 5 -----
 runtime/indent/yaml.vim        | 6 +++---
 3 files changed, 3 insertions(+), 13 deletions(-)

(limited to 'runtime/indent')

diff --git a/runtime/indent/testdir/yaml.in b/runtime/indent/testdir/yaml.in
index 32ddc60956..bf99668da2 100644
--- a/runtime/indent/testdir/yaml.in
+++ b/runtime/indent/testdir/yaml.in
@@ -13,11 +13,6 @@ map: &anchor
 map: val
 # END_INDENT
 
-# START_INDENT
-map: multiline
-value
-# END_INDENT
-
 # START_INDENT
 map: |
 line1
diff --git a/runtime/indent/testdir/yaml.ok b/runtime/indent/testdir/yaml.ok
index becdb1bae1..8b38633e71 100644
--- a/runtime/indent/testdir/yaml.ok
+++ b/runtime/indent/testdir/yaml.ok
@@ -13,11 +13,6 @@ map: &anchor
 map: val
 # END_INDENT
 
-# START_INDENT
-map: multiline
-  value
-# END_INDENT
-
 # START_INDENT
 map: |
   line1
diff --git a/runtime/indent/yaml.vim b/runtime/indent/yaml.vim
index ed57e68d8b..1f798416ed 100644
--- a/runtime/indent/yaml.vim
+++ b/runtime/indent/yaml.vim
@@ -2,7 +2,7 @@
 " Language:	YAML
 " Maintainer:	Nikolai Pavlov <zyx.vim@gmail.com>
 " Last Update:	Lukas Reineke
-" Last Change:	2021 Aug 13
+" Last Change:	2022 May 02
 
 " Only load this indent file when no other was loaded.
 if exists('b:did_indent')
@@ -54,7 +54,7 @@ let s:c_ns_anchor_name = s:c_ns_anchor_char.'+'
 let s:c_ns_anchor_property =  '\v\&'.s:c_ns_anchor_name
 
 let s:ns_word_char = '\v[[:alnum:]_\-]'
-let s:ns_tag_char  = '\v%('.s:ns_word_char.'|[#/;?:@&=+$.~*''()])'
+let s:ns_tag_char  = '\v%(%\x\x|'.s:ns_word_char.'|[#/;?:@&=+$.~*''()])'
 let s:c_named_tag_handle     = '\v\!'.s:ns_word_char.'+\!'
 let s:c_secondary_tag_handle = '\v\!\!'
 let s:c_primary_tag_handle   = '\v\!'
@@ -63,7 +63,7 @@ let s:c_tag_handle = '\v%('.s:c_named_tag_handle.
             \            '|'.s:c_primary_tag_handle.')'
 let s:c_ns_shorthand_tag = '\v'.s:c_tag_handle . s:ns_tag_char.'+'
 let s:c_non_specific_tag = '\v\!'
-let s:ns_uri_char  = '\v%('.s:ns_word_char.'\v|[#/;?:@&=+$,.!~*''()[\]])'
+let s:ns_uri_char  = '\v%(%\x\x|'.s:ns_word_char.'\v|[#/;?:@&=+$,.!~*''()[\]])'
 let s:c_verbatim_tag = '\v\!\<'.s:ns_uri_char.'+\>'
 let s:c_ns_tag_property = '\v'.s:c_verbatim_tag.
             \               '\v|'.s:c_ns_shorthand_tag.
-- 
cgit