aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormattn <mattn.jp@gmail.com>2013-05-08 22:02:40 +0900
committermattn <mattn.jp@gmail.com>2013-05-08 22:02:40 +0900
commitcb3fa42ae8bc348d2deed913d025e1cde212ba6a (patch)
treeafc5ffc4687c956c27b0c7d3c64ea1a82fa63ac6
parent73ae34eb58b5823c3daa97fe18f29cf6d62d641e (diff)
downloadvim-sonictemplate-cb3fa42ae8bc348d2deed913d025e1cde212ba6a.tar.gz
vim-sonictemplate-cb3fa42ae8bc348d2deed913d025e1cde212ba6a.tar.bz2
vim-sonictemplate-cb3fa42ae8bc348d2deed913d025e1cde212ba6a.zip
Fix var
-rw-r--r--autoload/sonictemplate.vim6
1 files changed, 4 insertions, 2 deletions
diff --git a/autoload/sonictemplate.vim b/autoload/sonictemplate.vim
index 751e08f..feeb1d2 100644
--- a/autoload/sonictemplate.vim
+++ b/autoload/sonictemplate.vim
@@ -115,7 +115,7 @@ function! s:getopt(k)
return b:sonictemplate[a:k]
endfunction
-let s:vars = {}
+let s:var = {}
function! sonictemplate#getvar(name)
return has_key(s:var, a:name) ? s:var[a:name] : ''
@@ -221,7 +221,9 @@ function! sonictemplate#apply(name, mode, ...) abort
let lhs = lhs[len(indent):]
let c = lhs . c . rhs
endif
- silent! normal dd
+ if getline('.') =~ '^\s*$'
+ silent! normal dd
+ endif
let c = indent . substitute(substitute(c, "\n", "\n".indent, 'g'), "\n".indent."\n", "\n\n", 'g')
if len(indent) && (&expandtab || &tabstop != &shiftwidth || indent =~ '^ \+$')
let c = substitute(c, "\t", repeat(' ', min([len(indent), &shiftwidth])), 'g')