summaryrefslogtreecommitdiffstats
path: root/indent
diff options
context:
space:
mode:
authorAdam Stankiewicz <sheerun@sher.pl>2022-02-21 00:04:43 +0100
committerAdam Stankiewicz <sheerun@sher.pl>2022-02-21 00:04:43 +0100
commit1d1f36b24ea601eb950865982e05b875aa702330 (patch)
tree94b9af10f5801fb3711088ee4f879e6995ae73c9 /indent
parentb77c5f11070ecb2ff343aa18b4ea859e6168f16c (diff)
downloadvim-polyglot-4.17.1.tar.gz
vim-polyglot-4.17.1.zip
Use old version of vim repository, fixes #779v4.17.1
closes #780
Diffstat (limited to 'indent')
-rw-r--r--indent/plantuml.vim1
-rw-r--r--indent/yaml.vim17
2 files changed, 9 insertions, 9 deletions
diff --git a/indent/plantuml.vim b/indent/plantuml.vim
index 1bf9d13e..81dc5049 100644
--- a/indent/plantuml.vim
+++ b/indent/plantuml.vim
@@ -2,7 +2,6 @@ if polyglot#init#is_disabled(expand('<sfile>:p'), 'plantuml', 'indent/plantuml.v
finish
endif
-scriptencoding utf-8
" Vim indent file
" Language: PlantUML
" License: VIM LICENSE
diff --git a/indent/yaml.vim b/indent/yaml.vim
index f19e7684..6c674b3b 100644
--- a/indent/yaml.vim
+++ b/indent/yaml.vim
@@ -3,18 +3,16 @@ if polyglot#init#is_disabled(expand('<sfile>:p'), 'yaml', 'indent/yaml.vim')
endif
" Vim indent file
-" Language: YAML
-" Maintainer: Nikolai Pavlov <zyx.vim@gmail.com>
-" Last Change: 2019 Sep 28
+" Language: YAML
+" Maintainer: Nikolai Pavlov <zyx.vim@gmail.com>
+" Last Update: Lukas Reineke
+" Last Change: 2021 Aug 13
" Only load this indent file when no other was loaded.
if exists('b:did_indent')
finish
endif
-let s:save_cpo = &cpo
-set cpo&vim
-
let b:did_indent = 1
setlocal indentexpr=GetYAMLIndent(v:lnum)
@@ -28,6 +26,9 @@ if exists('*GetYAMLIndent')
finish
endif
+let s:save_cpo = &cpo
+set cpo&vim
+
function s:FindPrevLessIndentedLine(lnum, ...)
let prevlnum = prevnonblank(a:lnum-1)
let curindent = a:0 ? a:1 : indent(a:lnum)
@@ -57,7 +58,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%(%\x\x|'.s:ns_word_char.'|[#/;?:@&=+$.~*''()])'
+let s:ns_tag_char = '\v%('.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\!'
@@ -66,7 +67,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%(%\x\x|'.s:ns_word_char.'\v|[#/;?:@&=+$,.!~*''()[\]])'
+let s:ns_uri_char = '\v%('.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.