From 706c80e8692bfdbbc3a62593ed16e84ad6c5f303 Mon Sep 17 00:00:00 2001 From: Chris Ewald Date: Sat, 18 Apr 2015 17:09:45 -0400 Subject: [PATCH] html layer: various improvements - add eco to web-mode auto-mode-alist - add emmet keybinding fixes to emacs-state-map as well - use only smartparens in webmode --- contrib/lang/html/packages.el | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/contrib/lang/html/packages.el b/contrib/lang/html/packages.el index ad7d0c1d7..0868e4f8d 100644 --- a/contrib/lang/html/packages.el +++ b/contrib/lang/html/packages.el @@ -46,6 +46,9 @@ :defer t :config (progn + ;; Only use smartparens in web-mode + (sp-local-pair 'web-mode "<%" "%>") + (setq web-mode-enable-auto-pairing nil) (evil-leader/set-key-for-mode 'web-mode "meh" 'web-mode-dom-errors-show @@ -113,6 +116,7 @@ ("\\.mustache\\'" . web-mode) ("\\.handlebars\\'" . web-mode) ("\\.hbs\\'" . web-mode) + ("\\.eco\\'" . web-mode) ("\\.djhtml\\'" . web-mode)))) (defun html/init-emmet-mode () @@ -127,6 +131,8 @@ (progn (evil-define-key 'insert emmet-mode-keymap "TAB" 'emmet-expand-yas) (evil-define-key 'insert emmet-mode-keymap (kbd "") 'emmet-expand-yas) + (evil-define-key 'emacs emmet-mode-keymap "TAB" 'emmet-expand-yas) + (evil-define-key 'emacs emmet-mode-keymap (kbd "") 'emmet-expand-yas) (spacemacs|hide-lighter emmet-mode)))) (defun html/post-init-evil-matchit ()