From 3b8742f3ccd53b21eb442d12f134efcb99e73321 Mon Sep 17 00:00:00 2001 From: Bjarke Vad Date: Tue, 24 Feb 2015 14:27:32 +0100 Subject: [PATCH] Fixes an issue with company-ghc not loading correctly - the `ghc-comp-init` function should not be called as a hook when `ghc-init` is already called in `haskell-hook` - load company-ghc with yasnippet support --- contrib/lang/haskell/packages.el | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/contrib/lang/haskell/packages.el b/contrib/lang/haskell/packages.el index 04f5b5c70..6a4e69550 100644 --- a/contrib/lang/haskell/packages.el +++ b/contrib/lang/haskell/packages.el @@ -90,7 +90,6 @@ ;; ;; use "mh" as prefix for documentation commands ;; (setq spacemacs/key-binding-prefixes '(("mh" . "Haskell Documentation"))) - (evil-leader/set-key-for-mode 'haskell-mode "mt" 'haskell-process-do-type "mi" 'haskell-process-do-info @@ -196,8 +195,7 @@ :if (configuration-layer/layer-declaredp 'company-mode) :init (progn - (add-to-list 'company-backends 'company-ghc) - (add-hook 'haskell-mode-hook 'ghc-comp-init)))) + (add-to-list 'company-backends (company-mode/backend-with-yas 'company-ghc))))) (defun haskell/init-hi2 () (use-package hi2