branch: elpa/haskell-mode
commit cf387f92b160ee87ce3e247542558d1b6ed84b3c
Merge: 727f72a2a4 e29d3865f7
Author: Steve Purcell <[email protected]>
Commit: GitHub <[email protected]>
Merge pull request #1850 from rntz/master
haskell-process-load-complete: handle ghc 9.10 message
---
haskell-load.el | 30 ++----------------------------
1 file changed, 2 insertions(+), 28 deletions(-)
diff --git a/haskell-load.el b/haskell-load.el
index 0b431c98d3..48e75e2e73 100644
--- a/haskell-load.el
+++ b/haskell-load.el
@@ -106,34 +106,8 @@ actual Emacs buffer of the module being loaded."
(with-current-buffer (haskell-interactive-mode-splices-buffer session)
(erase-buffer)))
(let* ((ok (cond
- ((haskell-process-consume
- process
- "Ok, \\(?:[0-9]+\\) modules? loaded\\.$")
- t)
- ((haskell-process-consume
- process
- "Ok, \\(?:[a-z]+\\) modules? loaded\\.$") ;; for ghc 8.4
- t)
- ((haskell-process-consume
- process
- "Failed, \\(?:[0-9]+\\) modules? loaded\\.$")
- nil)
- ((haskell-process-consume
- process
- "Failed, \\(?:[a-z]+\\) modules? loaded\\.$") ;; ghc 8.6.3
says so
- nil)
- ((haskell-process-consume
- process
- "Ok, modules loaded: \\(.+\\)\\.$")
- t)
- ((haskell-process-consume
- process
- "Failed, modules loaded: \\(.+\\)\\.$")
- nil)
- ((haskell-process-consume
- process
- "Failed, no modules loaded\\.$") ;; for ghc 8.4
- nil)
+ ((haskell-process-consume process "Ok, .*$") t)
+ ((haskell-process-consume process "Failed, .*$") nil)
(t
(error (message "Unexpected response from haskell process.")))))
(modules (haskell-process-extract-modules buffer))
