diff --git a/autoload/zencoding.vim b/autoload/zencoding.vim index a7b2013..40024c3 100644 --- a/autoload/zencoding.vim +++ b/autoload/zencoding.vim @@ -1,7 +1,7 @@ "============================================================================= " zencoding.vim " Author: Yasuhiro Matsumoto -" Last Change: 26-Mar-2013. +" Last Change: 09-Apr-2013. let s:save_cpo = &cpo set cpo&vim @@ -172,7 +172,7 @@ function! zencoding#toString(...) let inner = zencoding#lang#{rtype}#toString(s:zen_settings, current, type, inline, filters, itemno, indent) endif if current.multiplier > 1 - let inner = substitute(inner, '\$#', '$line'.(itemno+1).'$', 'g') + let inner = substitute(inner, '\("\zs$#\ze"\|\s\zs\$#"\|"\$#\ze\s\)', '$line'.(itemno+1).'$', 'g') endif let str .= inner else diff --git a/autoload/zencoding/lang/haml.vim b/autoload/zencoding/lang/haml.vim index e22cde2..be421c1 100644 --- a/autoload/zencoding/lang/haml.vim +++ b/autoload/zencoding/lang/haml.vim @@ -62,6 +62,7 @@ function! zencoding#lang#haml#toString(settings, current, type, inline, filters, let text = substitute(text, '\%(\\\)\@\