aboutsummaryrefslogtreecommitdiffstats
path: root/emmet-mode.el
diff options
context:
space:
mode:
Diffstat (limited to 'emmet-mode.el')
-rw-r--r--emmet-mode.el18
1 files changed, 10 insertions, 8 deletions
diff --git a/emmet-mode.el b/emmet-mode.el
index 1452731..898ec22 100644
--- a/emmet-mode.el
+++ b/emmet-mode.el
@@ -1977,7 +1977,7 @@ tbl) tbl)
(puthash "selfClosing" nil tbl)
tbl) tbl)
(puthash "div" (let ((tbl (make-hash-table :test 'equal)))
-(puthash "block" nil tbl)
+(puthash "block" t tbl)
(puthash "selfClosing" nil tbl)
tbl) tbl)
(puthash "dl" (let ((tbl (make-hash-table :test 'equal)))
@@ -2206,7 +2206,7 @@ tbl) tbl)
(puthash "selfClosing" nil tbl)
tbl) tbl)
(puthash "p" (let ((tbl (make-hash-table :test 'equal)))
-(puthash "block" nil tbl)
+(puthash "block" t tbl)
(puthash "selfClosing" nil tbl)
tbl) tbl)
(puthash "param" (let ((tbl (make-hash-table :test 'equal)))
@@ -2936,16 +2936,17 @@ tbl))
(self-closing? (and (not (or tag-txt content))
(or (not tag-has-body?)
(and settings (gethash "selfClosing" settings)))))
- (lf (if (or content-multiline? block-tag?) "\n")))
+ (block-indentation? (or content-multiline? (and block-tag? content)))
+ (lf (if block-indentation? "\n")))
(concat "<" tag-name id classes props
(if self-closing? "/>"
(concat ">"
(if tag-txt
- (if (or content-multiline? block-tag?)
+ (if block-indentation?
(emmet-indent tag-txt)
tag-txt))
(if content
- (if (or content-multiline? block-tag?)
+ (if block-indentation?
(emmet-indent content)
content))
lf
@@ -2989,15 +2990,16 @@ tbl))
(lambda (prop)
(concat ":" (symbol-name (car prop)) " \"" (cadr prop) "\""))))
(content-multiline? (and content (string-match "\n" content)))
- (block-tag? (and settings (gethash "block" settings))))
+ (block-tag? (and settings (gethash "block" settings)))
+ (block-indentation? (or content-multiline? (and block-tag? content))))
(concat "[:" tag-name id classes props
(if tag-txt
(let ((tag-txt-quoted (concat "\"" tag-txt "\"")))
- (if (or content-multiline? block-tag?)
+ (if block-indentation?
(emmet-indent tag-txt-quoted)
(concat " " tag-txt-quoted))))
(if content
- (if (or content-multiline? block-tag?)
+ (if block-indentation?
(emmet-indent content)
(concat " " content)))
"]")))