diff --git a/Check.hs b/Check.hs index e34e034..37189a1 100644 --- a/Check.hs +++ b/Check.hs @@ -25,4 +25,3 @@ check opt fileName = withGHC $ checkIt `gcatch` handleErrMsg load LoadAllTargets liftIO readLog options = ["-Wall","-fno-warn-unused-do-bind"] ++ ghcOpts opt - ++ map ("-i" ++) (checkIncludes opt) diff --git a/GHCMod.hs b/GHCMod.hs index 9576be7..3054afb 100644 --- a/GHCMod.hs +++ b/GHCMod.hs @@ -40,7 +40,6 @@ defaultOptions = Options { convert = toPlain , hlintOpts = [] , ghcOpts = [] - , checkIncludes = [] , operators = False , packageConfs = [] , useUserPackageConf = True @@ -65,9 +64,6 @@ argspec = [ Option "l" ["tolisp"] , Option "" ["no-user-package-conf"] (NoArg (\opts -> opts{ useUserPackageConf = False })) "do not read the user package database" - , Option "i" ["include"] - (ReqArg (\i opts -> opts{ checkIncludes = i : checkIncludes opts }) "include") - "directory to include in search for modules" ] parseArgs :: [OptDescr (Options -> Options)] -> [String] -> (Options, [String]) diff --git a/Types.hs b/Types.hs index deff8e2..d45ceee 100644 --- a/Types.hs +++ b/Types.hs @@ -14,7 +14,6 @@ data Options = Options { convert :: [String] -> String , hlintOpts :: [String] , ghcOpts :: [String] - , checkIncludes :: [String] , operators :: Bool , packageConfs :: [FilePath] , useUserPackageConf :: Bool diff --git a/elisp/ghc-flymake.el b/elisp/ghc-flymake.el index fb6cbf4..4af0c56 100644 --- a/elisp/ghc-flymake.el +++ b/elisp/ghc-flymake.el @@ -17,13 +17,6 @@ ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; -(defcustom ghc-flymake-check-includes nil - "list of directories to include when checking file" - :type '(repeat string) -;; :risky nil - :require 'ghc-flymake - :group 'ghc-flymake) - ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; (defconst ghc-error-buffer-name "*GHC Errors*") @@ -54,9 +47,8 @@ (if ghc-flymake-command (let ((hopts (ghc-mapconcat (lambda (x) (list "-h" x)) ghc-hlint-options))) `(,@hopts "lint" ,file)) - (let ((gopts (ghc-mapconcat (lambda (x) (list "-g" x)) ghc-ghc-options)) - (includes (ghc-mapconcat (lambda (x) (list "-i" x)) ghc-flymake-check-includes))) - `(,@gopts "check" ,@includes ,file)))) + (let ((gopts (ghc-mapconcat (lambda (x) (list "-g" x)) ghc-ghc-options))) + `(,@gopts "check" ,file)))) (defun ghc-flymake-toggle-command () (interactive)