From e6169a6597c79e53aa3632c8455c5ba10fa2ba74 Mon Sep 17 00:00:00 2001 From: Sam Schweigel Date: Tue, 20 Nov 2018 12:03:01 -0800 Subject: [PATCH] Fix loading for GHC 8.4, suggested by gregorycollins --- haskell-load.el | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/haskell-load.el b/haskell-load.el index 3f7e9c0ad..89d050d20 100644 --- a/haskell-load.el +++ b/haskell-load.el @@ -111,7 +111,7 @@ actual Emacs buffer of the module being loaded." t) ((haskell-process-consume process - "Ok, \\(?:[a-z]+\\) module loaded\\.$") ;; for ghc 8.4 + "Ok, \\(?:[a-z]+\\) modules? loaded\\.$") ;; for ghc 8.4 t) ((haskell-process-consume process @@ -125,6 +125,10 @@ actual Emacs buffer of the module being loaded." process "Failed, modules loaded: \\(.+\\)\\.$") nil) + ((haskell-process-consume + process + "Failed, no modules loaded\\.$") ;; for ghc 8.4 + nil) (t (error (message "Unexpected response from haskell process."))))) (modules (haskell-process-extract-modules buffer))