From 17d206a28f548c9ad6242a9fcd620029ecd8823e Mon Sep 17 00:00:00 2001 From: Henrik Lissner Date: Tue, 13 Mar 2018 01:24:08 -0400 Subject: [PATCH] feature/snippets: remap yas-insert-snippet instead Rather than binding directly to +snippets/expand-on-region --- modules/config/default/+bindings.el | 2 +- modules/feature/snippets/config.el | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/modules/config/default/+bindings.el b/modules/config/default/+bindings.el index 1307060f3..9a99563a3 100644 --- a/modules/config/default/+bindings.el +++ b/modules/config/default/+bindings.el @@ -643,7 +643,7 @@ [delete] #'+snippets/delete-forward-char-or-field) (:map yas-minor-mode-map :ig "" yas-maybe-expand - :v "" #'+snippets/expand-on-region)) + :v "" #'yas-insert-snippet)) ;; --- Major mode bindings -------------------------- diff --git a/modules/feature/snippets/config.el b/modules/feature/snippets/config.el index 5d4a23349..aea3fdf64 100644 --- a/modules/feature/snippets/config.el +++ b/modules/feature/snippets/config.el @@ -8,7 +8,11 @@ yas-lookup-snippet yas-insert-snippet yas-new-snippet yas-visit-snippet-file snippet-mode) :preface - (defvar yas-minor-mode-map (make-sparse-keymap)) + (defvar yas-minor-mode-map + (let ((map (make-sparse-keymap))) + (when (featurep! :feature evil) + (define-key map [remap yas-insert-snippet] #'+snippets/expand-on-region)) + map)) :init ;; Ensure `yas-reload-all' is called as late as possible. Other modules could