From 11550975415f5f19dd5905ea66d5afc1f840796e Mon Sep 17 00:00:00 2001 From: Henrik Lissner Date: Fri, 3 Jun 2016 00:45:39 -0400 Subject: [PATCH] Fix def-project-type yas-extra-modes race condition --- core/core-defuns.el | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/core/core-defuns.el b/core/core-defuns.el index e40a57104..9b9d8933c 100644 --- a/core/core-defuns.el +++ b/core/core-defuns.el @@ -161,6 +161,13 @@ Examples: :lighter ,(concat " " lighter) :keymap (make-sparse-keymap)) + (after! yasnippet + (add-hook ',mode-hook-sym + (lambda () + (if ,mode + (yas-activate-extra-mode ',mode) + (yas-deactivate-extra-mode ',mode))))) + ,(when bind `(map! :map ,mode-map ,bind)) (associate! ,mode @@ -171,13 +178,6 @@ Examples: :when ,pred) (defun ,mode-init-sym () - (after! yasnippet - (when (boundp 'yas--extra-modes) - (add-hook ',(intern (concat mode-name "-hook")) - (lambda () - (if (symbol-value ',mode) - (yas-activate-extra-mode ',mode) - (yas-deactivate-extra-mode ',mode)))))) (after! company-dict (push ',mode company-dict-minor-mode-list)) ,(when build