diff options
| author | Shin Aoyama <smihica@gmail.com> | 2014-08-08 03:13:55 +0900 |
|---|---|---|
| committer | Shin Aoyama <smihica@gmail.com> | 2014-08-08 03:13:55 +0900 |
| commit | ece1701b1e70956802c67d8b56234dc185f6550c (patch) | |
| tree | fb1a44eb3304f748c655131f38054f1a27a318e4 /src | |
| parent | fdfa4d71fe42f6410e0617b46ec5de2935d14a5e (diff) | |
| parent | 8b88b7d750901dc9f8adffb1bfa08cac5385917a (diff) | |
| download | emmet-mode-ece1701b1e70956802c67d8b56234dc185f6550c.tar.lz emmet-mode-ece1701b1e70956802c67d8b56234dc185f6550c.tar.xz emmet-mode-ece1701b1e70956802c67d8b56234dc185f6550c.zip | |
Merge pull request #29 from flyingleafe/master
Fixing improper block tags expansion
Diffstat (limited to 'src')
| -rw-r--r-- | src/html-abbrev.el | 14 | ||||
| -rw-r--r-- | src/preferences.el | 4 |
2 files changed, 10 insertions, 8 deletions
diff --git a/src/html-abbrev.el b/src/html-abbrev.el index ccc233e..7dbf842 100644 --- a/src/html-abbrev.el +++ b/src/html-abbrev.el @@ -553,16 +553,17 @@ (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 @@ -606,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))) "]"))) diff --git a/src/preferences.el b/src/preferences.el index a5f1d6d..c035c0c 100644 --- a/src/preferences.el +++ b/src/preferences.el @@ -1142,7 +1142,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))) @@ -1371,7 +1371,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))) |