branch: elpa/web-mode
commit 47c4d801e750e9d2da141dbe05467374d6a9192c
Author: George Kettleborough <[email protected]>
Commit: George Kettleborough <[email protected]>

    Set engine etc. after local variables have been set
    
    This allows setting `web-mode-engines-alist' in .dir-locals.el
---
 web-mode.el | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/web-mode.el b/web-mode.el
index f573d4d967..b6750ba319 100644
--- a/web-mode.el
+++ b/web-mode.el
@@ -2901,6 +2901,7 @@ another auto-completion with different ac-sources (e.g. 
ac-php)")
     (add-hook 'after-save-hook        #'web-mode-on-after-save t t)
     (add-hook 'change-major-mode-hook #'web-mode-on-exit nil t)
     (add-hook 'post-command-hook      #'web-mode-on-post-command nil t)
+    (add-hook 'hack-local-variables-hook 
#'web-mode-guess-engine-and-content-type t t)
 
     (cond
       ((boundp 'yas-after-exit-snippet-hook)
@@ -2919,7 +2920,6 @@ another auto-completion with different ac-sources (e.g. 
ac-php)")
     (when web-mode-enable-sexp-functions
       (setq-local forward-sexp-function #'web-mode-forward-sexp))
 
-    (web-mode-guess-engine-and-content-type)
     (setq web-mode-change-beg (point-min)
           web-mode-change-end (point-max))
     (when (> (point-max) 256000)

Reply via email to