From 8491c6b937c44c36a479e5b8cf0e30057fcd056f Mon Sep 17 00:00:00 2001 From: Henrik Lissner Date: Mon, 28 Mar 2016 21:42:04 -0400 Subject: [PATCH] Update file detection for (wordpress|jekyll|web)-mode --- modules/module-web.el | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/modules/module-web.el b/modules/module-web.el index 24986e64c..915b5f262 100644 --- a/modules/module-web.el +++ b/modules/module-web.el @@ -53,10 +53,9 @@ (use-package web-mode :mode ("\\.\\(p\\)?htm\\(l\\)?$" - "\\.tpl\\(\\.php\\)?$" + "\\.\\(tpl\\|blade\\)\\(\\.php\\)?$" "\\.erb$" - "wp-content/themes/.+/.+\\.php$" - "\\.blade\\.php$") + "wp-content/themes/.+/.+\\.php$") :init ;; smartparens handles this (setq web-mode-enable-auto-pairing nil @@ -111,8 +110,8 @@ (add-yas-minor-mode! 'jekyll-mode)) (associate! jekyll-mode :match "/\\(\\(css\\|_\\(layouts\\|posts\\|sass\\)\\)/.+\\|.+.html\\)$" - :files ("config.yml" "_layouts") - :in (web-mode scss-mode html-mode markdown-mode)) + :files ("config.yml" "_layouts/") + :in (web-mode scss-mode html-mode markdown-mode yaml-mode)) (add-hook! jekyll-mode (when (eq major-mode 'web-mode) (web-mode-set-engine "django"))) @@ -126,7 +125,7 @@ (add-yas-minor-mode! 'wordpress-mode)) (associate! wordpress-mode :match "/wp-\\(\\(content\\|admin\\|includes\\)/\\)?.+$" - :files ("wp-config.php" "wp-content")) + :files ("wp-config.php" "wp-content/")) (after! company-dict (add-to-list 'company-dict-minor-mode-list 'wordpress-mode)) (provide 'module-web)