From aa1d73c6a1d38ca7f8a83e44f2d1ba18fafb69bd Mon Sep 17 00:00:00 2001 From: "John L. Walker" Date: Mon, 20 Jul 2015 00:32:07 -0700 Subject: [PATCH] Remove cabal-ghci #486 --- haskell-customize.el | 8 +------- haskell-process.el | 7 ------- 2 files changed, 1 insertion(+), 14 deletions(-) diff --git a/haskell-customize.el b/haskell-customize.el index 1ab691122..22b868c9e 100644 --- a/haskell-customize.el +++ b/haskell-customize.el @@ -44,7 +44,7 @@ Used for locating additional package data files.") (defcustom haskell-process-type 'auto "The inferior Haskell process type to use." - :type '(choice (const auto) (const ghci) (const cabal-repl) (const cabal-ghci) (const stack-ghci)) + :type '(choice (const auto) (const ghci) (const cabal-repl) (const stack-ghci)) :group 'haskell-interactive) (defcustom haskell-process-wrapper-function @@ -104,12 +104,6 @@ when showing type information about symbols." :group 'haskell-interactive :type '(choice string (repeat string))) -(defcustom haskell-process-path-cabal-ghci - "cabal-ghci" - "The path for starting cabal-ghci." - :group 'haskell-interactive - :type '(choice string (repeat string))) - (defcustom haskell-process-path-stack "stack" "The path for starting stack." diff --git a/haskell-process.el b/haskell-process.el index e9bc1a7bf..751cda1f0 100644 --- a/haskell-process.el +++ b/haskell-process.el @@ -98,13 +98,6 @@ HPTYPE is the result of calling `'haskell-process-type`' function." haskell-process-args-cabal-repl (let ((target (haskell-session-target session))) (if target (list target) nil))))))) - ('cabal-ghci - (append (list (format "Starting inferior cabal-ghci process using %s ..." - haskell-process-path-cabal-ghci) - session-name - nil) - (apply haskell-process-wrapper-function - (list (list haskell-process-path-cabal-ghci))))) ('stack-ghci (append (list (format "Starting inferior stack GHCi process using %s" haskell-process-path-stack) session-name