emenel/doomemacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

[breaking] lang/haskell: refactor + require flags #158

Browse source 
The +intero/+dante module flags are now required; there is no default.
This commit is contained in:
Henrik Lissner 2017-10-03 00:52:16 +02:00
parent 6be89e1df6
commit 061e71a846
No known key found for this signature in database
GPG key ID: 5F6C0EA160557395
3 changed files with 10 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

2
modules/lang/haskell/+dante.el
View file

@ -9,5 +9,5 @@
(warn "haskell-mode: couldn't find cabal") (warn "haskell-mode: couldn't find cabal")
(remove-hook 'haskell-mode-hook #'dante-mode)) (remove-hook 'haskell-mode-hook #'dante-mode))
(add-hook 'dante-mode-hook #'flycheck-mode)) (add-hook 'dante-mode-hook #'flycheck-mode))

2
modules/lang/haskell/+intero.el
View file

@ -12,7 +12,7 @@
(add-hook! 'intero-mode-hook #'(flycheck-mode eldoc-mode)) (add-hook! 'intero-mode-hook #'(flycheck-mode eldoc-mode))
(set! :popup "^intero:backend:" :regex t :size 12) (set! :popup "^intero:backend:" :regex t :size 12)
(set! :jump :definition #'intero-goto-definition)) (set! :jump 'haskell-mode :definition #'intero-goto-definition))
(def-package! hindent (def-package! hindent

13
modules/lang/haskell/config.el
View file

@ -1,5 +1,13 @@
;;; lang/haskell/config.el -*- lexical-binding: t; -*- ;;; lang/haskell/config.el -*- lexical-binding: t; -*-
(cond ((featurep! +intero) (load! +intero))
((featurep! +dante) (load! +dante)))
;;
;; Common plugins
;;
(def-package! haskell-mode (def-package! haskell-mode
:mode "\\.hs$" :mode "\\.hs$"
:mode ("\\.ghci$" . ghci-script-mode) :mode ("\\.ghci$" . ghci-script-mode)
@ -30,8 +38,3 @@
(setq company-ghc-show-info 'oneline)) (setq company-ghc-show-info 'oneline))
;;
(if (featurep! +dante)
(load! +dante)
(load! +intero))