Merge branch 'master' into opts-in-lib

2016-02-09 21:22:15 +02:00
parent b1d123c4b6 3ca408ec6a
commit d47c9f1205
6 changed files with 20 additions and 9 deletions
--- a/Language/Haskell/GhcMod/Options/Options.hs
+++ b/Language/Haskell/GhcMod/Options/Options.hs
@@ -175,6 +175,11 @@ globalArgSpec = Options
          <=> metavar "OPT"
          <=> help "Option to be passed to GHC"
      <*> many fileMappingSpec
+      <*> strOption
+          $$  long "encoding"
+          <=> value "UTF-8"
+          <=> showDefault
+          <=> help "I/O encoding"
  where
    fileMappingSpec =
      getFileMapping . splitOn '=' <$> strOption