commit ca63501fbcd1cf9c8aa9ff12c093c95b62a89ed7
author Bram Moolenaar <Bram@vim.org> Fri Sep 25 20:34:21 2015 +0200
committer Bram Moolenaar <Bram@vim.org> Fri Sep 25 20:34:21 2015 +0200
tree b081d09eab19c8dd4ebbf56a6d304809aba3852f
parent c1d20998d71f3fa0aebeeee42007a337cd7e3d8a

Update various runtime files.

runtime/indent/yaml.vim

diff --git a/runtime/indent/yaml.vim b/runtime/indent/yaml.vim
index 1d03715..95a53b1 100644
--- a/runtime/indent/yaml.vim
+++ b/runtime/indent/yaml.vim
@@ -1,6 +1,7 @@
 " Vim indent file
 " Language:         YAML
 " Maintainer:       Nikolai Pavlov <zyx.vim@gmail.com>
+" Last Change:	    2015 Sep 25
 
 " Only load this indent file when no other was loaded.
 if exists('b:did_indent')
@@ -115,8 +116,13 @@
                     \                                       s:liststartregex))
     elseif line =~# s:mapkeyregex
         " Same for line containing mapping key
-        return indent(s:FindPrevLEIndentedLineMatchingRegex(a:lnum,
-                    \                                       s:mapkeyregex))
+        let prevmapline = s:FindPrevLEIndentedLineMatchingRegex(a:lnum,
+                    \                                           s:mapkeyregex)
+        if getline(prevmapline) =~# '^\s*- '
+            return indent(prevmapline) + 2
+        else
+            return indent(prevmapline)
+        endif
     elseif prevline =~# '^\s*- '
         " - List with
         "   multiline scalar