From e990cebbaef7b38fb02bd96698ae3bb405afa4b8 Mon Sep 17 00:00:00 2001
From: mattn <mattn.jp@gmail.com>
Date: Tue, 26 Nov 2013 12:49:45 +0900
Subject: [PATCH] Workaround

---
 autoload/emmet.vim | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/autoload/emmet.vim b/autoload/emmet.vim
index cc512e1..fb64aaf 100644
--- a/autoload/emmet.vim
+++ b/autoload/emmet.vim
@@ -452,6 +452,7 @@ function! emmet#expandAbbr(mode, abbr) range
   let line = ''
   let part = ''
   let rest = ''
+  let ret = pumvisible() ? "" : "<right>"
 
   let filters = emmet#getFilters(type)
   if len(filters) == 0
@@ -461,7 +462,7 @@ function! emmet#expandAbbr(mode, abbr) range
   if a:mode == 2
     let leader = substitute(input('Tag: ', ''), '^\s*\(.*\)\s*$', '\1', 'g')
     if len(leader) == 0
-      return ''
+      return ret
     endif
     let mx = '|\(\%(html\|haml\|slim\|e\|c\|fc\|xsl\|t\|\/[^ ]\+\)\s*,\{0,1}\s*\)*$'
     if leader =~ mx
@@ -553,7 +554,7 @@ function! emmet#expandAbbr(mode, abbr) range
     endif
     normal! $
     call emmet#expandAbbr(0, "")
-    return ''
+    return ret
   else
     let line = getline('.')
     if col('.') < len(line)
@@ -650,7 +651,7 @@ function! emmet#expandAbbr(mode, abbr) range
   if g:emmet_debug > 1
     call getchar()
   endif
-  return ''
+  return ret
 endfunction
 
 function! emmet#moveNextPrevItem(flag)
@@ -671,7 +672,7 @@ function! emmet#imageSize()
   let rtype = emmet#lang#exists(type) ? type : 'html'
   call emmet#lang#{rtype}#imageSize()
   silent! call setpos('.', orgpos)
-  return ''
+  return pumvisible() ? "" : "<right>"
 endfunction
 
 function! emmet#encodeImage()
@@ -684,7 +685,7 @@ function! emmet#toggleComment()
   let type = emmet#getFileType()
   let rtype = emmet#lang#exists(type) ? type : 'html'
   call emmet#lang#{rtype}#toggleComment()
-  return ''
+  return pumvisible() ? "" : "<right>"
 endfunction
 
 function! emmet#balanceTag(flag) range
@@ -710,7 +711,7 @@ function! emmet#removeTag()
   let type = emmet#getFileType()
   let rtype = emmet#lang#exists(type) ? type : 'html'
   call emmet#lang#{rtype}#removeTag()
-  return ''
+  return pumvisible() ? "" : "<right>"
 endfunction
 
 function! emmet#anchorizeURL(flag)
@@ -719,7 +720,7 @@ function! emmet#anchorizeURL(flag)
   let url = matchstr(getline(pos1[0])[pos1[1]-1:], mx)
   let block = [pos1, [pos1[0], pos1[1] + len(url) - 1]]
   if !emmet#util#cursorInRegion(block)
-    return ''
+    return pumvisible() ? "" : "<right>"
   endif
 
   let mx = '.*<title[^>]*>\s*\zs\([^<]\+\)\ze\s*<\/title[^>]*>.*'
@@ -759,7 +760,7 @@ function! emmet#anchorizeURL(flag)
   let indent = substitute(getline('.'), '^\(\s*\).*', '\1', '')
   let expand = substitute(expand, "\n", "\n" . indent, 'g')
   call emmet#util#setContent(block, expand)
-  return ''
+  return pumvisible() ? "" : "<right>"
 endfunction
 
 function! emmet#codePretty() range