diff options
| author | flyingleafe <flyingleafe@gmail.com> | 2014-08-05 16:16:18 +0600 |
|---|---|---|
| committer | flyingleafe <flyingleafe@gmail.com> | 2014-08-05 16:16:18 +0600 |
| commit | 8b88b7d750901dc9f8adffb1bfa08cac5385917a (patch) | |
| tree | fb1a44eb3304f748c655131f38054f1a27a318e4 | |
| parent | 477fdda54e5081d831c12c9c4e4f8b8814a6e7f1 (diff) | |
| download | emmet-mode-8b88b7d750901dc9f8adffb1bfa08cac5385917a.tar.lz emmet-mode-8b88b7d750901dc9f8adffb1bfa08cac5385917a.tar.xz emmet-mode-8b88b7d750901dc9f8adffb1bfa08cac5385917a.zip | |
Make the same logic for hiccup tags
| -rw-r--r-- | emmet-mode.el | 7 | ||||
| -rw-r--r-- | src/html-abbrev.el | 7 |
2 files changed, 8 insertions, 6 deletions
diff --git a/emmet-mode.el b/emmet-mode.el index 1eb248b..898ec22 100644 --- a/emmet-mode.el +++ b/emmet-mode.el @@ -2990,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))) "]"))) diff --git a/src/html-abbrev.el b/src/html-abbrev.el index f11327b..7dbf842 100644 --- a/src/html-abbrev.el +++ b/src/html-abbrev.el @@ -607,15 +607,16 @@ (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))) "]"))) |