From f56c035dea465eafaec237c804dd7a7fd6a1b2cf Mon Sep 17 00:00:00 2001 From: syl20bnr Date: Sat, 28 Mar 2015 20:45:25 -0400 Subject: [PATCH] haskell layer: disable ghc-check.el overlays with flycheck enabledcc --- contrib/lang/haskell/packages.el | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/contrib/lang/haskell/packages.el b/contrib/lang/haskell/packages.el index 15acebd6e..7b6a6d4b8 100644 --- a/contrib/lang/haskell/packages.el +++ b/contrib/lang/haskell/packages.el @@ -196,10 +196,12 @@ (defun haskell-hook () (ghc-init) ;; Use advanced indention - (if (not haskell-enable-shm-support) - (turn-on-haskell-indentation) - ) - ) + ;; (if (not haskell-enable-shm-support) + ;; (turn-on-haskell-indentation)) + (when (configuration-layer/package-declaredp 'flycheck) + ;; remove overlays from ghc-check.el if flycheck is enabled + (set-face-attribute 'ghc-face-error nil :underline nil) + (set-face-attribute 'ghc-face-warn nil :underline nil))) ;; Useful to have these keybindings for .cabal files, too. (defun haskell-cabal-hook ()