From 1f454b56a411c7035c336a1cf11a9ecacb5c2e85 Mon Sep 17 00:00:00 2001 From: Henrik Lissner Date: Sat, 13 Jan 2018 15:30:01 -0500 Subject: [PATCH] feature/evil: ensure evil-embrace's hooks run sooner #345 evil-embrace's hooks would run too late (after evil-surround loads), requiring you to reload affected buffers. --- modules/feature/evil/config.el | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/modules/feature/evil/config.el b/modules/feature/evil/config.el index d57a063a3..f7b4d0747 100644 --- a/modules/feature/evil/config.el +++ b/modules/feature/evil/config.el @@ -162,6 +162,17 @@ (def-package! evil-embrace :after evil-surround + :commands (embrace-add-pair embrace-add-pair-regexp) + :init + (add-hook 'LaTeX-mode-hook #'embrace-LaTeX-mode-hook) + (add-hook 'org-mode-hook #'embrace-org-mode-hook) + ;; Add extra pairs + (add-hook! emacs-lisp-mode + (embrace-add-pair ?\` "`" "'")) + (add-hook! (emacs-lisp-mode lisp-mode) + (embrace-add-pair-regexp ?f "([^ ]+ " ")" #'+evil--embrace-elisp-fn)) + (add-hook! (org-mode LaTeX-mode) + (embrace-add-pair-regexp ?l "\\[a-z]+{" "}" #'+evil--embrace-latex)) :config (setq evil-embrace-show-help-p nil) (evil-embrace-enable-evil-surround-integration) @@ -200,17 +211,7 @@ :read-function #'+evil--embrace-escaped :left-regexp "\\[[{(]" :right-regexp "\\[]})]")) - (default-value 'embrace--pairs-list)) - - ;; Add extra pairs - (add-hook 'LaTeX-mode-hook #'embrace-LaTeX-mode-hook) - (add-hook 'org-mode-hook #'embrace-org-mode-hook) - (add-hook! emacs-lisp-mode - (embrace-add-pair ?\` "`" "'")) - (add-hook! (emacs-lisp-mode lisp-mode) - (embrace-add-pair-regexp ?f "([^ ]+ " ")" #'+evil--embrace-elisp-fn)) - (add-hook! (org-mode LaTeX-mode) - (embrace-add-pair-regexp ?l "\\[a-z]+{" "}" #'+evil--embrace-latex))) + (default-value 'embrace--pairs-list))) (def-package! evil-escape