From 8b9bcac7a03cabc0cd7cace8bb00b8c22884d98e Mon Sep 17 00:00:00 2001
From: mattn <mattn.jp@gmail.com>
Date: Thu, 8 Jan 2015 14:23:34 +0900
Subject: [PATCH] Add some workaround for #248

---
 autoload/emmet.vim           | 1 +
 autoload/emmet/lang/html.vim | 6 +++++-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/autoload/emmet.vim b/autoload/emmet.vim
index a83503c..bbc6027 100644
--- a/autoload/emmet.vim
+++ b/autoload/emmet.vim
@@ -1769,6 +1769,7 @@ let s:emmet_settings = {
 \        'block_elements': 'address,applet,blockquote,button,center,dd,del,dir,div,dl,dt,fieldset,form,frameset,hr,iframe,ins,isindex,li,link,map,menu,noframes,noscript,object,ol,p,pre,script,table,tbody,td,tfoot,th,thead,tr,ul,h1,h2,h3,h4,h5,h6',
 \        'inline_elements': 'a,abbr,acronym,applet,b,basefont,bdo,big,br,button,cite,code,del,dfn,em,font,i,iframe,img,input,ins,kbd,label,map,object,q,s,samp,script,select,small,span,strike,strong,sub,sup,textarea,tt,u,var',
 \        'empty_element_suffix': g:emmet_html5 ? '>' : ' />',
+\        'indent_blockelement': 0,
 \    },
 \    'htmldjango': {
 \        'extends': 'html',
diff --git a/autoload/emmet/lang/html.vim b/autoload/emmet/lang/html.vim
index 2c81f48..1de1f62 100644
--- a/autoload/emmet/lang/html.vim
+++ b/autoload/emmet/lang/html.vim
@@ -510,7 +510,11 @@ function! emmet#lang#html#toString(settings, current, type, inline, filters, ite
         let str .= inner
       endfor
     else
-      let str .= '${cursor}'
+      if settings.html.indent_blockelement && len(current_name) > 0 && stridx(','.settings.html.inline_elements.',', ','.current_name.',') == -1
+        let str .= "\n" . indent . '${cursor}' . "\n"
+      else
+        let str .= '${cursor}'
+      endif
     endif
     if dr
       let str .= "\n"