branch: externals/yaml commit 419e85fbcef78cb330f6503b5967440744d5209b Author: Zachary Romero <zacrom...@posteo.net> Commit: Zachary Romero <zacrom...@posteo.net>
fix folding block parsing error --- yaml-tests.el | 3 ++- yaml.el | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/yaml-tests.el b/yaml-tests.el index cd5155d537..d3d53182ab 100644 --- a/yaml-tests.el +++ b/yaml-tests.el @@ -513,7 +513,8 @@ keep: |+ (should (yaml-parse-string "\"oarsietnaorsetnaorstnearsotnarsoitneiaosretnaoirsetnaorsentaorsentoaroarsietnaorsetnaorstnearsotnarsoitneiaosretnaoirsetnaorsentaorsentoaroarsietnaorsetnaorstnearsotnarsoitneiaosretnaoirsetnaorsentaorsentoaroarsietnaorsetnaorstnearsotnarsoitneiaosretnaoirsetnaorsentaorsentoaroarsietnaorsetnaorstnearsotnarsoitneiaosretnaoirsetnaorsentaorsentoaroarsietnaorsetnaorstnearsotnarsoitneiaosretnaoirsetnaorsentaorsentoaroarsietnaorsetnaorstnearsotnarsoitneiaosretnao [...] # beep" :object-type 'alist)) (should (yaml-parse-string "|\n oarsietnaorsetnaorstnearsotnarsoitneiaosretnaoirsetnaorsentaorsentoaroarsietnaorsetnaorstnearsotnarsoitneiaosretnaoirsetnaorsentaorsentoaroarsietnaorsetnaorstnearsotnarsoitneiaosretnaoirsetnaorsentaorsentoaroarsietnaorsetnaorstnearsotnarsoitneiaosretnaoirsetnaorsentaorsentoaroarsietnaorsetnaorstnearsotnarsoitneiaosretnaoirsetnaorsentaorsentoaroarsietnaorsetnaorstnearsotnarsoitneiaosretnaoirsetnaorsentaorsentoaroarsietnaorsetnaorstnearsotnarsoitneiaosretn [...] -# beep" :object-type 'alist))) +# beep" :object-type 'alist)) + (should (yaml-parse-string "another:\n value:\n deeply: >\n nested" :object-type 'alist))) (defun yaml-test-round-trip (o) diff --git a/yaml.el b/yaml.el index cfae27374d..916b273871 100644 --- a/yaml.el +++ b/yaml.el @@ -1919,7 +1919,7 @@ Rules for this function are defined by the yaml-spec JSON file." (yaml--all (yaml--chr ?\>) (yaml--parse-from-grammar 'c-b-block-header - (yaml--state-curr-m) + n (yaml--state-curr-t)) (yaml--parse-from-grammar 'l-folded-content (max (+ n (yaml--state-curr-m)) 1)