diff options
| author | Shin Aoyama <smihica@gmail.com> | 2018-06-13 12:41:20 +0900 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-06-13 12:41:20 +0900 |
| commit | 1acb821e0142136344ccf40c1e5fb664d7db2e70 (patch) | |
| tree | c657a125f56f8c53d15b0860924c5f28063070cd | |
| parent | 45c633ac79bba1dd185c541830c126db37a63dab (diff) | |
| parent | b2ee27da66789dfeaa76c5a1ac3449c4e068bb6c (diff) | |
| download | emmet-mode-1acb821e0142136344ccf40c1e5fb664d7db2e70.tar.lz emmet-mode-1acb821e0142136344ccf40c1e5fb664d7db2e70.tar.xz emmet-mode-1acb821e0142136344ccf40c1e5fb664d7db2e70.zip | |
Merge pull request #102 from Kungsgeten/master
Changes to emmet-default-filter
| -rw-r--r-- | emmet-mode.el | 31 |
1 files changed, 20 insertions, 11 deletions
diff --git a/emmet-mode.el b/emmet-mode.el index d8f059d..13f1f1c 100644 --- a/emmet-mode.el +++ b/emmet-mode.el @@ -244,6 +244,13 @@ e. g. without semicolons") less-css-mode) "Major modes that use emmet for CSS, rather than HTML.") +(defvar emmet-fallback-filter '("html") + "Fallback filter for `emmet-default-filter', if none is found.") + +(defvar emmet-file-filter nil + "File local filter used by `emmet-default-filter'.") +(make-variable-buffer-local 'emmet-file-filter) + (defun emmet-transform (input) (if (or (emmet-detect-style-tag-and-attr) emmet-use-css-transform) (emmet-css-transform input) @@ -3104,16 +3111,18 @@ tbl)) (defun emmet-default-filter () "Default filter(s) to be used if none is specified." - (let* ((file-ext (car (emmet-regex ".*\\(\\..*\\)" (or (buffer-file-name) "") 1))) - (defaults '(".html" ("html") - ".htm" ("html") - ".haml" ("haml") - ".clj" ("hic"))) - (default-else '("html")) - (selected-default (member file-ext defaults))) - (if selected-default - (cadr selected-default) - default-else))) + (or emmet-file-filter + (let* ((file-ext (car (emmet-regex ".*\\(\\..*\\)" (or (buffer-file-name) "") 1))) + (defaults '(".html" ("html") + ".htm" ("html") + ".haml" ("haml") + ".clj" ("hic") + ".cljs" ("hic"))) + (default-else emmet-fallback-filter) + (selected-default (member file-ext defaults))) + (if selected-default + (cadr selected-default) + default-else)))) (defun emmet-numbering (input) (emmet-parse @@ -4107,7 +4116,7 @@ tbl)) (emmet-join-string (mapcar #'(lambda (expr) - (let* + (let* ((hash-map (if emmet-use-sass-syntax emmet-sass-snippets emmet-css-snippets)) (basement (emmet-aif |