ALlow multiple comma-separated files for `--defaults`.

1 files changed, 7 insertions, 6 deletions

diff --git a/src/Text/Pandoc/App/CommandLineOptions.hs b/src/Text/Pandoc/App/CommandLineOptions.hs
index 019ec9220..cf5fb51dc 100644
--- a/src/Text/Pandoc/App/CommandLineOptions.hs
+++ b/src/Text/Pandoc/App/CommandLineOptions.hs
@@ -64,6 +64,7 @@ import Data.Text (Text)
 import Text.DocTemplates (ToContext(toVal), Context(..))
 import qualified Text.Pandoc.UTF8 as UTF8
 import qualified Data.YAML as Y
+import Data.List.Split (splitWhen)
 
 parseOptions :: [OptDescr (Opt -> IO Opt)] -> Opt -> IO Opt
 parseOptions options' defaults = do
@@ -161,11 +162,8 @@ options =
 
     , Option "d" ["defaults"]
                  (ReqArg
-                  (\arg opt -> do
-                      let fp' = if null (takeExtension arg)
-                                   then addExtension arg "yaml"
-                                   else arg
-                      foldM applyDefaults opt [fp']
+                  (\arg opt ->
+                      foldM applyDefaults opt (splitWhen (==',') arg)
                   )
                   "FILE")
                 ""
@@ -982,7 +980,10 @@ splitField s =
 
 -- | Apply defaults from --defaults file.
 applyDefaults :: Opt -> FilePath -> IO Opt
-applyDefaults opt fp = runIOorExplode $ do
+applyDefaults opt filepath = runIOorExplode $ do
+  let fp = if null (takeExtension filepath)
+              then addExtension filepath "yaml"
+              else filepath
   setVerbosity $ optVerbosity opt
   dataDirs <- liftIO defaultUserDataDirs
   let fps = case optDataDir opt of