From 37dcecbec9220e9359e27741640be67040bf9ab3 Mon Sep 17 00:00:00 2001
From: Magnus Therning <magnus@therning.org>
Date: Sun, 12 May 2019 22:22:17 +0200
Subject: [PATCH] Put the jump handlers straight into the buffer var

Fixes #12238
Fixes #12289
---
 CHANGELOG.develop             | 4 ++--
 layers/+lang/haskell/funcs.el | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG.develop b/CHANGELOG.develop
index e51ebbd8d..743b36b5b 100644
--- a/CHANGELOG.develop
+++ b/CHANGELOG.develop
@@ -1478,9 +1478,9 @@ Other:
   - ~SPC r i~ runs new =spacemacs/haskell-format-imports= function
   - ~SPC m g b~ returns from definition in =intero-mode=
     (thanks to Magnus Therning)
-- Fixed jump handlers conflict for haskell and intero (thanks to CthulhuDen)
-- Fixed haskell jump handler for dante (thanks to cjay)
 - Enable LSP mode using HIE.
+- Fixed jump handlers for =dante= and =inferno=
+  (thanks to cjay, CthulhuDen and Magnus Therning)
 **** 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/funcs.el b/layers/+lang/haskell/funcs.el
index 92f1ddc6d..1697366ae 100644
--- a/layers/+lang/haskell/funcs.el
+++ b/layers/+lang/haskell/funcs.el
@@ -83,7 +83,7 @@
 
 (defun spacemacs-haskell//setup-dante ()
   (dante-mode)
-  (add-to-list 'spacemacs-jump-handlers-haskell-mode 'xref-find-definitions))
+  (add-to-list 'spacemacs-jump-handlers 'xref-find-definitions))
 
 (defun spacemacs-haskell//setup-dante-company ()
   (spacemacs|add-company-backends
@@ -100,7 +100,7 @@
 (defun spacemacs-haskell//setup-intero ()
   (interactive-haskell-mode)
   (intero-mode)
-  (add-to-list 'spacemacs-jump-handlers-haskell-mode 'intero-goto-definition))
+  (add-to-list 'spacemacs-jump-handlers 'intero-goto-definition))
 
 (defun spacemacs-haskell//setup-intero-company ()
   (spacemacs|add-company-backends