diff --git a/GHCMod.hs b/GHCMod.hs index d136b6b..6e0866c 100644 --- a/GHCMod.hs +++ b/GHCMod.hs @@ -25,23 +25,14 @@ usage = "ghc-mod version 0.4.0\n" defaultOptions :: Options defaultOptions = Options { convert = toPlain - , ghc = "ghc" - , ghci = "ghci" , ghcPkg = "ghc-pkg" , outDir = outputDir - , outFile = outputFile } argspec :: [OptDescr (Options -> Options)] argspec = [ Option "l" ["tolisp"] (NoArg (\opts -> opts { convert = toLisp })) "print as a list of Lisp" - , Option "g" ["ghc"] - (ReqArg (\str opts -> opts { ghc = str }) "ghc") - "GHC path" - , Option "i" ["ghci"] - (ReqArg (\str opts -> opts { ghci = str }) "ghci") - "ghci path" , Option "p" ["ghc-pkg"] (ReqArg (\str opts -> opts { ghcPkg = str }) "ghc-pkg") "ghc-pkg path" diff --git a/Param.hs b/Param.hs index 9ca4c72..d1ac9d0 100644 --- a/Param.hs +++ b/Param.hs @@ -2,11 +2,8 @@ module Param where data Options = Options { convert :: [String] -> String - , ghc :: FilePath - , ghci :: FilePath , ghcPkg :: FilePath , outDir :: FilePath - , outFile :: FilePath } outputDir :: String diff --git a/elisp/ghc-func.el b/elisp/ghc-func.el index ec03c26..1341d77 100644 --- a/elisp/ghc-func.el +++ b/elisp/ghc-func.el @@ -59,13 +59,9 @@ ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; (defvar ghc-module-command "ghc-mod") -(defvar ghc-ghc-command (ghc-which "ghc")) -(defvar ghc-ghci-command (ghc-which "ghci")) (defvar ghc-ghc-pkg-command (ghc-which "ghc-pkg")) (defun ghc-module-command-args () - (list "-g" ghc-ghc-command - "-i" ghc-ghci-command - "-p" ghc-ghc-pkg-command)) + (list "-p" ghc-ghc-pkg-command)) (provide 'ghc-func)