From 3c1a8d1924b89992ff06419fc2cad54f6d0f12b9 Mon Sep 17 00:00:00 2001
From: John MacFarlane <fiddlosopher@gmail.com>
Date: Sat, 20 Apr 2013 10:09:17 -0700
Subject: Revert "Improved previous patch so it really solves the Windows
issue."
This reverts commit e80116c813ecfc8cde094cddd36a3b083c108fd8.
---
src/Text/Pandoc/Shared.hs | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
(limited to 'src')
diff --git a/src/Text/Pandoc/Shared.hs b/src/Text/Pandoc/Shared.hs
index 0780d4a60..001af6c6d 100644
--- a/src/Text/Pandoc/Shared.hs
+++ b/src/Text/Pandoc/Shared.hs
@@ -105,6 +105,7 @@ import Network.HTTP (findHeader, rspBody,
import Network.Browser (browse, setAllowRedirects, request)
#ifdef EMBED_DATA_FILES
import Text.Pandoc.Data (dataFiles)
+import System.FilePath ( joinPath )
#else
import Paths_pandoc (getDataFileName)
#endif
@@ -525,7 +526,7 @@ readDefaultDataFile fname =
Nothing -> ioError $ userError
$ "Data file `" ++ fname ++ "' does not exist"
Just contents -> return contents
- where makeCanonical = intercalate "/" . transformPathParts . splitBy (=='/')
+ where makeCanonical = joinPath . transformPathParts . splitBy (=='/')
transformPathParts = reverse . foldl go []
go as "." = as
go (_:as) ".." = as
--
cgit v1.2.3