TakeV/spacemacs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Fix emmet expansion if yas isn’t turned on

Browse source
This commit is contained in:
Eivind Fonn 2016-07-26 20:10:45 +09:00
parent 7ca4cc0554
commit 6bb73f193f
2 changed files with 22 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
layers/+lang/html/funcs.el Normal file
View file

@ -0,0 +1,16 @@
;;; funcs.el --- HTML Layer functions File for Spacemacs
;;
;; Copyright (c) 2012-2016 Sylvain Benner & Contributors
;;
;; Author: Sylvain Benner <sylvain.benner@gmail.com>
;; URL: https://github.com/syl20bnr/spacemacs
;;
;; This file is not part of GNU Emacs.
;;
;;; License: GPLv3
(defun spacemacs/emmet-expand ()
(interactive)
(if (bound-and-true-p yas-minor-mode)
(call-interactively 'emmet-expand-yas)
(call-interactively 'emmet-expand-line)))

12
layers/+lang/html/packages.el
View file

@ -91,12 +91,12 @@
web-mode-hook))
:config
(progn
(evil-define-key 'insert emmet-mode-keymap (kbd "TAB") 'emmet-expand-yas)
(evil-define-key 'insert emmet-mode-keymap (kbd "<tab>") 'emmet-expand-yas)
(evil-define-key 'emacs emmet-mode-keymap (kbd "TAB") 'emmet-expand-yas)
(evil-define-key 'emacs emmet-mode-keymap (kbd "<tab>") 'emmet-expand-yas)
(evil-define-key 'hybrid emmet-mode-keymap (kbd "TAB") 'emmet-expand-yas)
(evil-define-key 'hybrid emmet-mode-keymap (kbd "<tab>") 'emmet-expand-yas)
(evil-define-key 'insert emmet-mode-keymap (kbd "TAB") 'spacemacs/emmet-expand)
(evil-define-key 'insert emmet-mode-keymap (kbd "<tab>") 'spacemacs/emmet-expand)
(evil-define-key 'emacs emmet-mode-keymap (kbd "TAB") 'spacemacs/emmet-expand)
(evil-define-key 'emacs emmet-mode-keymap (kbd "<tab>") 'spacemacs/emmet-expand)
(evil-define-key 'hybrid emmet-mode-keymap (kbd "TAB") 'spacemacs/emmet-expand)
(evil-define-key 'hybrid emmet-mode-keymap (kbd "<tab>") 'spacemacs/emmet-expand)
(spacemacs|hide-lighter emmet-mode))))
(defun html/post-init-evil-matchit ()