From 480c6df909c7958eedf0256fab650cce82c57028 Mon Sep 17 00:00:00 2001 From: syl20bnr Date: Mon, 4 May 2015 00:27:13 -0400 Subject: [PATCH] haskell layer: fix haskell-snippets loading fixes #1471 --- contrib/lang/haskell/packages.el | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/contrib/lang/haskell/packages.el b/contrib/lang/haskell/packages.el index 8cf721a07..ade51ac16 100644 --- a/contrib/lang/haskell/packages.el +++ b/contrib/lang/haskell/packages.el @@ -183,8 +183,17 @@ (add-hook 'evil-emacs-state-exit-hook 'spacemacs//haskell-indentation-hide-guides)))) (defun haskell/init-haskell-snippets () - (use-package haskell-snippets - :defer t)) + ;; manually load the package since the current implementation is not lazy + ;; loading friendly (funny coming from the haskell mode :-)) + (setq haskell-snippets-dir (spacemacs//get-package-directory + 'haskell-snippets)) + + (defun haskell-snippets-initialize () + (let ((snip-dir (expand-file-name "snippets" haskell-snippets-dir))) + (add-to-list 'yas-snippet-dirs snip-dir t) + (yas-load-directory snip-dir))) + + (eval-after-load 'yasnippet '(haskell-snippets-initialize))) (defun haskell/init-hindent () (use-package hindent