From b4083d169de155bb244e248857bc18543bf701b7 Mon Sep 17 00:00:00 2001 From: Tim Pope Date: Sat, 30 Nov 2019 19:25:14 -0500 Subject: [PATCH] Sync with official runtime files --- compiler/haml.vim | 2 +- compiler/sass.vim | 2 +- indent/haml.vim | 4 ++-- indent/sass.vim | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/compiler/haml.vim b/compiler/haml.vim index cea7721..9464c3d 100644 --- a/compiler/haml.vim +++ b/compiler/haml.vim @@ -1,7 +1,7 @@ " Vim compiler file " Compiler: Haml " Maintainer: Tim Pope -" Last Change: 2013 May 30 +" Last Change: 2016 Aug 29 if exists("current_compiler") finish diff --git a/compiler/sass.vim b/compiler/sass.vim index e7265df..9c540ac 100644 --- a/compiler/sass.vim +++ b/compiler/sass.vim @@ -1,7 +1,7 @@ " Vim compiler file " Compiler: Sass " Maintainer: Tim Pope -" Last Change: 2013 May 30 +" Last Change: 2016 Aug 29 if exists("current_compiler") finish diff --git a/indent/haml.vim b/indent/haml.vim index 53ed504..7613fae 100644 --- a/indent/haml.vim +++ b/indent/haml.vim @@ -1,7 +1,7 @@ " Vim indent file " Language: Haml " Maintainer: Tim Pope -" Last Change: 2016 Aug 29 +" Last Change: 2017 Jun 13 if exists("b:did_indent") finish @@ -37,7 +37,7 @@ function! GetHamlIndent() let line = substitute(line,'^\s\+','','') let indent = indent(lnum) let cindent = indent(v:lnum) - let sw = exists('*shiftwidth') ? shiftwidth() : &sw + let sw = shiftwidth() if cline =~# '\v^-\s*%(elsif|else|when)>' let indent = cindent < indent ? cindent : indent - sw endif diff --git a/indent/sass.vim b/indent/sass.vim index d87b371..d6dbf3a 100644 --- a/indent/sass.vim +++ b/indent/sass.vim @@ -1,7 +1,7 @@ " Vim indent file " Language: Sass " Maintainer: Tim Pope -" Last Change: 2016 Aug 29 +" Last Change: 2017 Jun 13 if exists("b:did_indent") finish @@ -29,7 +29,7 @@ function! GetSassIndent() let indent = indent(lnum) let cindent = indent(v:lnum) if line !~ s:property && line !~ s:extend && cline =~ s:property - return indent + (exists('*shiftwidth') ? shiftwidth() : &sw) + return indent + shiftwidth() else return -1 endif