From 3a509fc0d9eee15b90e31fb9044fd6d3b57110f3 Mon Sep 17 00:00:00 2001 From: "Cthulhu.Den" Date: Thu, 8 Nov 2018 01:08:28 +0300 Subject: [PATCH] Fix jump handlers conflict for haskell and intero --- CHANGELOG.develop | 1 + layers/+lang/haskell/config.el | 1 - layers/+lang/haskell/packages.el | 2 +- 3 files changed, 2 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.develop b/CHANGELOG.develop index bd0b0a5ae..1e895c679 100644 --- a/CHANGELOG.develop +++ b/CHANGELOG.develop @@ -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 diff --git a/layers/+lang/haskell/config.el b/layers/+lang/haskell/config.el index bf3105d37..3ae6bd663 100644 --- a/layers/+lang/haskell/config.el +++ b/layers/+lang/haskell/config.el @@ -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. diff --git a/layers/+lang/haskell/packages.el b/layers/+lang/haskell/packages.el index 993b1cde0..e998840ab 100644 --- a/layers/+lang/haskell/packages.el +++ b/layers/+lang/haskell/packages.el @@ -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 " λ" " \\")