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
This commit is contained in:
Bjarke Vad 2015-02-24 14:27:32 +01:00 committed by syl20bnr
parent 0a7ee5a444
commit 3b8742f3cc

View file

@ -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