Fix jump handlers conflict for haskell and intero

This commit is contained in:
Cthulhu.Den 2018-11-08 01:08:28 +03:00 committed by Codruț Constantin Gușoi
parent c9eacd1f7e
commit 3a509fc0d9
3 changed files with 2 additions and 2 deletions

View File

@ -1238,6 +1238,7 @@ Benner and Paweł Siudak):
- ~SPC r i~ runs new =spacemacs/haskell-format-imports= function
- ~SPC m g b~ returns from definition in =intero-mode=
(thanks to Magnus Therning)
- Fix jump handlers conflict for haskell and intero (thanks to CthulhuDen)
**** Helm
- Limited =ripgrep= results to 512 columns by default, and added
=spacemacs-helm-rg-max-column-number= layer variable to configure the above

View File

@ -14,7 +14,6 @@
(setq haskell-modes '(haskell-mode literate-haskell-mode))
(spacemacs|define-jump-handlers haskell-mode haskell-mode-jump-to-def-or-tag)
(spacemacs|define-jump-handlers intero-mode intero-goto-definition)
(defvar haskell-completion-backend 'ghci
"Completion backend used by company.

View File

@ -114,7 +114,7 @@
:modes haskell-mode)
(add-hook 'haskell-mode-hook 'interactive-haskell-mode)
(add-hook 'haskell-mode-hook 'intero-mode)
(add-to-list 'spacemacs-jump-handlers 'intero-goto-definition)
(add-to-list 'spacemacs-jump-handlers-haskell-mode 'intero-goto-definition)
:config
(progn
(spacemacs|diminish intero-mode " λ" " \\")