From f8693d0f8c0833a576768f41bb1df5b13bf90027 Mon Sep 17 00:00:00 2001 From: Henrik Lissner Date: Fri, 24 Apr 2020 04:07:57 -0400 Subject: [PATCH] Load snippets *after* yasnippet config in daemon --- modules/editor/snippets/config.el | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/modules/editor/snippets/config.el b/modules/editor/snippets/config.el index 2a337412f..71218a728 100644 --- a/modules/editor/snippets/config.el +++ b/modules/editor/snippets/config.el @@ -20,9 +20,7 @@ ;; Remove default ~/.emacs.d/snippets (defvar yas-snippet-dirs nil) - (if (daemonp) - ;; If in a daemon session, front-load this expensive work: - (after! yasnippet (yas-reload-all)) + (unless (daemonp) ;; Ensure `yas-reload-all' is called as late as possible. Other modules ;; could have additional configuration for yasnippet. For example, ;; file-templates. @@ -89,7 +87,10 @@ ;; Replace commands with superior alternatives :map yas-minor-mode-map [remap yas-new-snippet] #'+snippets/new - [remap yas-visit-snippet-file] #'+snippets/edit)) + [remap yas-visit-snippet-file] #'+snippets/edit) + + ;; If in a daemon session, front-load this expensive work: + (if (daemonp) (yas-reload-all))) (use-package! auto-yasnippet