aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKungsgeten <sjostrand.erik@gmail.com>2018-05-10 16:01:34 +0200
committerKungsgeten <sjostrand.erik@gmail.com>2018-05-10 16:01:34 +0200
commit16c76d04a3fc38a7ae2f13866679166b7ad134e7 (patch)
treeb04967ea38c0167266ddf800022af55880d7bc29
parent5af39aaef59125fd80901f275c23c89493f9d133 (diff)
downloademmet-mode-16c76d04a3fc38a7ae2f13866679166b7ad134e7.tar.lz
emmet-mode-16c76d04a3fc38a7ae2f13866679166b7ad134e7.tar.xz
emmet-mode-16c76d04a3fc38a7ae2f13866679166b7ad134e7.zip
Changes to emmet-default-filter
Added variables emmet-fallback-filter and emmet-file-filter. These can be used to configure the behaviour of emmet-default-filter. Also added "hic" as the default filter for .cljs-files.
-rw-r--r--emmet-mode.el31
1 files changed, 20 insertions, 11 deletions
diff --git a/emmet-mode.el b/emmet-mode.el
index c1326ed..3230e4b 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)
@@ -3008,16 +3015,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
@@ -4011,7 +4020,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