Skip to content

Commit 5632eef

Browse files
Merge pull request #1625 from sjsch/master
Fix loading for GHC 8.4, suggested by gregorycollins
2 parents 6a70c18 + e6169a6 commit 5632eef

File tree

1 file changed

+5
-1
lines changed

1 file changed

+5
-1
lines changed

haskell-load.el

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ actual Emacs buffer of the module being loaded."
111111
t)
112112
((haskell-process-consume
113113
process
114-
"Ok, \\(?:[a-z]+\\) module loaded\\.$") ;; for ghc 8.4
114+
"Ok, \\(?:[a-z]+\\) modules? loaded\\.$") ;; for ghc 8.4
115115
t)
116116
((haskell-process-consume
117117
process
@@ -125,6 +125,10 @@ actual Emacs buffer of the module being loaded."
125125
process
126126
"Failed, modules loaded: \\(.+\\)\\.$")
127127
nil)
128+
((haskell-process-consume
129+
process
130+
"Failed, no modules loaded\\.$") ;; for ghc 8.4
131+
nil)
128132
(t
129133
(error (message "Unexpected response from haskell process.")))))
130134
(modules (haskell-process-extract-modules buffer))

0 commit comments

Comments
 (0)