Merge pull request haskell#1607 from kuribas/master

Fix error when haskell-process-path-ghci has arguments
pedroaarm · Sep 11, 2018 · 034fad0 · 034fad0
2 parents c08eeb0 + fb04872
commit 034fad0
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/inf-haskell.el b/inf-haskell.el
@@ -59,8 +59,11 @@ directory structure."
   (cl-ecase (haskell-process-type)
     ('ghci       (cond ((eq system-type 'cygwin) (nconc "ghcii.sh"
                                                         haskell-process-args-ghci))
-                       (t (nconc `(,haskell-process-path-ghci)
-                                 haskell-process-args-ghci))))
+                       (t (append
+                           (if (listp haskell-process-path-ghci)
+                               haskell-process-path-ghci
+                             (list haskell-process-path-ghci))
+                           haskell-process-args-ghci))))
     ('cabal-repl (nconc `(,haskell-process-path-cabal
                           "repl")
                         haskell-process-args-cabal-repl))