Fixed ghci-ng keybindings being overriden

This commit is contained in:
Bjarke Vad 2015-05-04 18:07:36 +02:00 committed by syl20bnr
parent 7f8fa1de8d
commit 7c3d95c962

View file

@ -58,19 +58,6 @@
;; use only internal indentation system from haskell
(electric-indent-local-mode -1))
;;GHCi-ng
(when haskell-enable-ghci-ng-support
;; haskell-process-type is set to auto, so setup ghci-ng for either case
;; if haskell-process-type == cabal-repl
(setq haskell-process-args-cabal-repl '("--ghc-option=-ferror-spans" "--with-ghc=ghci-ng"))
;; if haskell-process-type == GHCi
(setq haskell-process-path-ghci "ghci-ng")
(evil-leader/set-key-for-mode 'haskell-mode
"mu" 'haskell-mode-find-uses
"mht" 'haskell-mode-show-type-at
"mgg" 'haskell-mode-goto-loc))
;; hooks
(add-hook 'haskell-mode-hook 'spacemacs/init-haskell-mode)
(add-hook 'haskell-cabal-mode-hook 'haskell-cabal-hook)
@ -161,6 +148,19 @@
'(define-key haskell-cabal-mode-map
[?\C-c ?\C-z] 'haskell-interactive-switch))))
;;GHCi-ng
(when haskell-enable-ghci-ng-support
;; haskell-process-type is set to auto, so setup ghci-ng for either case
;; if haskell-process-type == cabal-repl
(setq haskell-process-args-cabal-repl '("--ghc-option=-ferror-spans" "--with-ghc=ghci-ng"))
;; if haskell-process-type == GHCi
(setq haskell-process-path-ghci "ghci-ng")
(evil-leader/set-key-for-mode 'haskell-mode
"mu" 'haskell-mode-find-uses
"mht" 'haskell-mode-show-type-at
"mgg" 'haskell-mode-goto-loc))
(eval-after-load 'haskell-indentation
'(progn
;; Show indentation guides in insert or emacs state only.