diff options
| author | John MacFarlane <jgm@berkeley.edu> | 2015-01-04 20:26:52 -0800 |
|---|---|---|
| committer | John MacFarlane <jgm@berkeley.edu> | 2015-01-04 20:26:52 -0800 |
| commit | e2d86dfe286085cc33b513b17444e846fae0ce30 (patch) | |
| tree | 533008ff05af1546854623c9c6d145c901dbc441 /src/Text/Pandoc/Templates.hs | |
| parent | 4866c905b0dbca5338c04b9cdcad20bc5846c710 (diff) | |
| parent | 9c68017786932e355461168d3ca0593e36d8d7f8 (diff) | |
Merge pull request #1856 from markwright/master
Allow compilation with ghc 7.10.1 RC1 and haddock-library 1.2
Diffstat (limited to 'src/Text/Pandoc/Templates.hs')
| -rw-r--r-- | src/Text/Pandoc/Templates.hs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/Text/Pandoc/Templates.hs b/src/Text/Pandoc/Templates.hs index a92f91b41..eefce2744 100644 --- a/src/Text/Pandoc/Templates.hs +++ b/src/Text/Pandoc/Templates.hs @@ -124,7 +124,7 @@ getDefaultTemplate :: (Maybe FilePath) -- ^ User data directory to search first -> String -- ^ Name of writer -> IO (Either E.IOException String) getDefaultTemplate user writer = do - let format = takeWhile (`notElem` "+-") writer -- strip off extensions + let format = takeWhile (`notElem` ("+-" :: String)) writer -- strip off extensions case format of "native" -> return $ Right "" "json" -> return $ Right "" @@ -288,7 +288,7 @@ reservedWords :: [Text] reservedWords = ["else","endif","for","endfor","sep"] skipEndline :: Parser () -skipEndline = P.try $ P.skipMany (P.satisfy (`elem` " \t")) >> P.char '\n' >> return () +skipEndline = P.try $ P.skipMany (P.satisfy (`elem` (" \t" :: String))) >> P.char '\n' >> return () pConditional :: Parser Template pConditional = do |