Revert macros to ...! name convention (elisp doesn't like @...)

This commit is contained in:
Henrik Lissner
2017-02-23 00:06:12 -05:00
parent b64d5554e3
commit 33c88d4f82
125 changed files with 877 additions and 880 deletions

View File

@ -1,6 +1,6 @@
;;; lang/web/config.el
(@def-package web-mode
(def-package! web-mode
:mode ("\\.p?html?$"
"\\.\\(tpl\\|blade\\)\\(\\.php\\)?$"
"\\.erb$"
@ -12,13 +12,13 @@
:init
(add-hook 'web-mode-hook 'turn-off-smartparens-mode)
:config
(@set :company-backend 'web-mode '(company-web-html company-yasnippet))
(set! :company-backend 'web-mode '(company-web-html company-yasnippet))
(setq web-mode-enable-html-entities-fontification t)
;; Fix blank line numbers after unfolding
(advice-add 'web-mode-fold-or-unfold :after 'nlinum--flush)
(@map :map web-mode-map
(map! :map web-mode-map
(:localleader :n "t" 'web-mode-element-rename)
"M-/" 'web-mode-comment-or-uncomment
:i "SPC" 'self-insert-command
@ -31,17 +31,17 @@
:nv "]T" 'web-mode-element-child
:nv "[T" 'web-mode-element-parent)
(@def-package company-web :after company))
(def-package! company-web :after company))
(@def-package haml-mode :mode "\\.haml$")
(def-package! haml-mode :mode "\\.haml$")
(@def-package pug-mode
(def-package! pug-mode
:mode ("\\.jade$" "\\.pug$")
:config
(@set :company-backend 'pug-mode '(company-yasnippet))
(@map :map pug-mode-map
(set! :company-backend 'pug-mode '(company-yasnippet))
(map! :map pug-mode-map
:i [tab] 'doom/dumb-indent
:i [backtab] 'doom/dumb-dedent))
@ -50,14 +50,14 @@
;; Tools
;;
(@def-package emmet-mode
(def-package! emmet-mode
:commands emmet-mode
:preface (defvar emmet-mode-keymap (make-sparse-keymap))
:init
(@add-hook (scss-mode web-mode html-mode haml-mode nxml-mode) 'emmet-mode)
(add-hook! (scss-mode web-mode html-mode haml-mode nxml-mode) 'emmet-mode)
:config
(setq emmet-move-cursor-between-quotes t)
(@map :map emmet-mode-keymap
(map! :map emmet-mode-keymap
:v "M-e" 'emmet-wrap-with-markup
:i "M-e" 'emmet-expand-yas
:i "M-E" 'emmet-expand-line))