aboutsummaryrefslogtreecommitdiff
path: root/runtime/indent/liquid.vim
diff options
context:
space:
mode:
authorJustin M. Keyes <justinkz@gmail.com>2017-11-07 01:34:28 +0100
committerJustin M. Keyes <justinkz@gmail.com>2017-11-07 01:37:30 +0100
commita39bf019580d82f8ca5f9e8d99dd856418ffc491 (patch)
tree9040de854b2065059b7b41ab1c5d099b9174b1a8 /runtime/indent/liquid.vim
parent599170de8304d74baa3e18df0929330e3773a14d (diff)
downloadrneovim-a39bf019580d82f8ca5f9e8d99dd856418ffc491.tar.gz
rneovim-a39bf019580d82f8ca5f9e8d99dd856418ffc491.tar.bz2
rneovim-a39bf019580d82f8ca5f9e8d99dd856418ffc491.zip
vim-patch:3ec574f2b549
Update runtime files. Includes changing &sw to shiftwidth() for all indent scripts. https://github.com/vim/vim/commit/3ec574f2b549f456f664f689d6da36dc5719aeb9
Diffstat (limited to 'runtime/indent/liquid.vim')
-rw-r--r--runtime/indent/liquid.vim4
1 files changed, 2 insertions, 2 deletions
diff --git a/runtime/indent/liquid.vim b/runtime/indent/liquid.vim
index f8e1c83079..7beb0388d1 100644
--- a/runtime/indent/liquid.vim
+++ b/runtime/indent/liquid.vim
@@ -1,7 +1,7 @@
" Vim indent file
" Language: Liquid
" Maintainer: Tim Pope <vimNOSPAM@tpope.org>
-" Last Change: 2016 Aug 29
+" Last Change: 2017 Jun 13
if exists('b:did_indent')
finish
@@ -54,7 +54,7 @@ function! GetLiquidIndent(...)
let line = substitute(line,'\C^\%(\s*{%\s*end\w*\s*%}\)\+','','')
let line .= matchstr(cline,'\C^\%(\s*{%\s*end\w*\s*%}\)\+')
let cline = substitute(cline,'\C^\%(\s*{%\s*end\w*\s*%}\)\+','','')
- let sw = exists('*shiftwidth') ? shiftwidth() : &sw
+ let sw = shiftwidth()
let ind += sw * s:count(line,'{%\s*\%(if\|elsif\|else\|unless\|ifchanged\|case\|when\|for\|empty\|tablerow\|capture\)\>')
let ind -= sw * s:count(line,'{%\s*end\%(if\|unless\|ifchanged\|case\|for\|tablerow\|capture\)\>')
let ind -= sw * s:count(cline,'{%\s*\%(elsif\|else\|when\|empty\)\>')