diff options
| author | John MacFarlane <jgm@berkeley.edu> | 2017-12-13 21:42:06 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-12-13 21:42:06 -0700 |
| commit | 52a8116e71636f05053c959675b3abcb745e921a (patch) | |
| tree | f9b7efe3a7569c689255824977b21c877ab22b16 /src/Text/Pandoc/App.hs | |
| parent | 440533643e768b584194aaac59e26e35d53f6745 (diff) | |
| parent | 4c64af4407776e6ceb2fcc8a803b83568b4c1964 (diff) | |
| download | pandoc-52a8116e71636f05053c959675b3abcb745e921a.tar.gz | |
Merge pull request #4153 from tarleb/unify-lua-init
Unify lua initalization
Diffstat (limited to 'src/Text/Pandoc/App.hs')
| -rw-r--r-- | src/Text/Pandoc/App.hs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/Text/Pandoc/App.hs b/src/Text/Pandoc/App.hs index f7d6450cc..e70b606a9 100644 --- a/src/Text/Pandoc/App.hs +++ b/src/Text/Pandoc/App.hs @@ -223,7 +223,7 @@ convertWithOpts opts = do if ".lua" `isSuffixOf` format -- note: use non-lowercased version writerName then return (TextWriter - (\o d -> liftIO $ writeCustom writerName o d) + (\o d -> writeCustom writerName o d) :: Writer PandocIO, mempty) else case getWriter writerName of Left e -> E.throwIO $ PandocAppError $ @@ -846,7 +846,7 @@ applyLuaFilters :: Maybe FilePath -> [FilePath] -> String -> Pandoc applyLuaFilters mbDatadir filters format d = do expandedFilters <- mapM (expandFilterPath mbDatadir) filters let go f d' = do - res <- runLuaFilter mbDatadir f format d' + res <- runLuaFilter f format d' case res of Right x -> return x Left (LuaException s) -> E.throw (PandocFilterError f s) |