From 40a44a60c83946f2b15e42496b42bfe8f4319a1f Mon Sep 17 00:00:00 2001
From: mattn <mattn.jp@gmail.com>
Date: Thu, 4 Mar 2010 19:39:03 +0900
Subject: [PATCH] text comment block.

---
 zencoding.vim | 38 +++++++++++++++++++++++++++-----------
 1 file changed, 27 insertions(+), 11 deletions(-)

diff --git a/zencoding.vim b/zencoding.vim
index b46ba94..7c28f1e 100644
--- a/zencoding.vim
+++ b/zencoding.vim
@@ -1276,17 +1276,33 @@ endfunction
 
 function! s:zen_toggleComment()
   let pos = getpos('.')
-  call search('<', 'bW')
-  if searchpair('<!-- <[a-z]', '', ' -->', 'bcW')
-    exe "normal! d5l"
-    call search('\(</[^>]\+>\|<[^/>]\+/>\) -->', 'ceW')
-    exe "normal! d4h"
-    let pos[2] -= 5
-  elseif searchpair('<[a-z]', '', '\(</[^>]\+>\|<[^/>]\+/>\)', 'bcW')
-    exe "normal! i<!-- "
-    let rpos = search('\(<\/[^>]\+>\|[^\/>]*\/>\)', 'ceW')
-    exe "normal! a --\<c-v>>"
-    let pos[2] += 5
+  let sp1 = searchpos('<', 'bnW')
+  let sp2 = searchpos('>', 'bnW')
+  if sp1[0]<sp2[0] || (sp1[0] == sp2[0] && sp1[1]<sp2[1])
+    if searchpair('<!-- ', '', ' -->', 'bcW')
+      exe "normal! d5l"
+      call search(' -->', 'ceW')
+      exe "normal! d4h"
+      let pos[2] -= 5
+    elseif searchpair('[^\s]', '', '[^\s]', 'bcW')
+      exe "normal! Bi<!--"
+      call search('\(\s\|$\)', 'eW')
+      exe "normal! a--\<c-v>>"
+      let pos[2] += 4
+    endif
+  else
+    call search('<', 'bW')
+    if searchpair('<!-- <[a-z]', '', ' -->', 'bcW')
+      exe "normal! d5l"
+      call search('\(</[^>]\+>\|<[^/>]\+/>\) -->', 'ceW')
+      exe "normal! d4h"
+      let pos[2] -= 5
+    elseif searchpair('<[a-z]', '', '\(</[^>]\+>\|<[^/>]\+/>\)', 'bcW')
+      exe "normal! i<!-- "
+      call search('\(<\/[^>]\+>\|[^\/>]*\/>\)', 'ceW')
+      exe "normal! a --\<c-v>>"
+      let pos[2] += 5
+    endif
   endif
   call setpos('.', pos)
 endfunction