summaryrefslogtreecommitdiffstats
path: root/runtime/indent/html.vim
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2018-08-28 22:58:02 +0200
committerBram Moolenaar <Bram@vim.org>2018-08-28 22:58:02 +0200
commitfc65cabb15d0236bce001ad78e12a40511caf941 (patch)
tree071cd16ce17e02121ac1c7db7c7518cc70f10a79 /runtime/indent/html.vim
parent627cb6a6b37d17433fe2d7df1f287eefb5b370e3 (diff)
Update runtime files.
Diffstat (limited to 'runtime/indent/html.vim')
-rw-r--r--runtime/indent/html.vim8
1 files changed, 6 insertions, 2 deletions
diff --git a/runtime/indent/html.vim b/runtime/indent/html.vim
index ba043e968a..6c866594c5 100644
--- a/runtime/indent/html.vim
+++ b/runtime/indent/html.vim
@@ -663,7 +663,7 @@ func! s:CSSIndent()
else
let cur_hasfield = curtext =~ '^\s*[a-zA-Z0-9-]\+:'
let prev_unfinished = s:CssUnfinished(prev_text)
- if !cur_hasfield && (prev_hasfield || prev_unfinished)
+ if prev_unfinished
" Continuation line has extra indent if the previous line was not a
" continuation line.
let extra = shiftwidth()
@@ -716,9 +716,13 @@ func! s:CSSIndent()
endfunc "}}}
" Inside <style>: Whether a line is unfinished.
+" tag:
+" tag: blah
+" tag: blah &&
+" tag: blah ||
func! s:CssUnfinished(text)
"{{{
- return a:text =~ '\s\(||\|&&\|:\)\s*$'
+ return a:text =~ '\(||\|&&\|:\|\k\)\s*$'
endfunc "}}}
" Search back for the first unfinished line above "lnum".