Add PR #102 changes into src/

smihica · Sep 23, 2019 · 5493751 · 5493751
1 parent 690c439
commit 5493751
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 13 deletions.
diff --git a/emmet-mode.el b/emmet-mode.el
@@ -238,7 +238,6 @@ NOTE: only \" /\", \"/\" and \"\" are valid."
 e. g. without semicolons")
 (make-variable-buffer-local 'emmet-use-sass-syntax)
 
-
 (defvar emmet-css-major-modes
   '(css-mode
     scss-mode
@@ -251,6 +250,13 @@ e. g. without semicolons")
   '(rjsx-mode
     typescript-tsx-mode))
 
+(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)
@@ -4129,7 +4135,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

diff --git a/src/html-abbrev.el b/src/html-abbrev.el
@@ -51,16 +51,18 @@
 
 (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

diff --git a/src/mode-def.el b/src/mode-def.el
@@ -82,7 +82,6 @@ NOTE: only \" /\", \"/\" and \"\" are valid."
 e. g. without semicolons")
 (make-variable-buffer-local 'emmet-use-sass-syntax)
 
-
 (defvar emmet-css-major-modes
   '(css-mode
     scss-mode
@@ -95,6 +94,13 @@ e. g. without semicolons")
   '(rjsx-mode
     typescript-tsx-mode))
 
+(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)