From eaa447fb40e608ebb1c4fd4187ad588b18a2255e Mon Sep 17 00:00:00 2001
From: mattn <mattn.jp@gmail.com>
Date: Fri, 14 Oct 2011 21:35:38 +0900
Subject: [PATCH] support: Upgraded "Wrap With Abbreviation" action

---
 autoload/zencoding.vim | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

diff --git a/autoload/zencoding.vim b/autoload/zencoding.vim
index 9c94e83..1fa59d9 100644
--- a/autoload/zencoding.vim
+++ b/autoload/zencoding.vim
@@ -379,9 +379,6 @@ function! s:zen_toString_haml(settings, current, type, inline, filters, itemno,
     endif
   endif
   let str .= "\n"
-  if !empty(current.parent) && empty(current.parent.parent)
-    let str = substitute(str, '\$#', '$line'.(itemno+1).'$', 'g')
-  endif
   return str
 endfunction
 
@@ -478,9 +475,6 @@ function! s:zen_toString_html(settings, current, type, inline, filters, itemno,
   if len(comment) > 0
     let str .= "<!-- /" . comment . " -->" . (inline ? "" : "\n") . comment_indent
   endif
-  if !empty(current.parent) && empty(current.parent.parent)
-    let str = substitute(str, '\$#', '$line'.(itemno+1).'$', 'g')
-  endif
   return str
 endfunction
 
@@ -519,13 +513,18 @@ function! s:zen_toString(...)
   let str = ''
   while itemno < current.multiplier
     if len(current.name)
+      let inner = ''
       if exists('*g:zen_toString_'.type)
-        let str .= function('g:zen_toString_'.type)(s:zen_settings, current, type, inline, filters, itemno, indent)
+        let inner = function('g:zen_toString_'.type)(s:zen_settings, current, type, inline, filters, itemno, indent)
       elseif s:zen_useFilter(filters, 'haml')
-        let str .= s:zen_toString_haml(s:zen_settings, current, type, inline, filters, itemno, indent)
+        let inner = s:zen_toString_haml(s:zen_settings, current, type, inline, filters, itemno, indent)
       else
-        let str .= s:zen_toString_html(s:zen_settings, current, type, inline, filters, itemno, indent)
+        let inner = s:zen_toString_html(s:zen_settings, current, type, inline, filters, itemno, indent)
       endif
+      if current.multiplier > 1
+        let inner = substitute(inner, '\$#', '$line'.(itemno+1).'$', 'g')
+      endif
+      let str .= inner
     else
       let snippet = current.snippet
       if len(current.snippet) == 0
@@ -645,7 +644,7 @@ function! zencoding#expandAbbr(mode) range
     if leader =~ '\*'
       let query = substitute(leader, '*', '*' . (a:lastline - a:firstline + 1), '')
       if query !~ '}\s*$'
-        let query .= '>{$line$}'
+        let query .= '>{$#}'
       endif
       let items = s:zen_parseIntoTree(query, type).child
       for item in items