diff options
| author | John MacFarlane <fiddlosopher@gmail.com> | 2013-04-19 23:24:06 -0700 |
|---|---|---|
| committer | John MacFarlane <fiddlosopher@gmail.com> | 2013-04-19 23:24:06 -0700 |
| commit | e80116c813ecfc8cde094cddd36a3b083c108fd8 (patch) | |
| tree | 710f1d5d832360ffdc1de91554790b1a2f33088c /src/Text | |
| parent | 6bd686a4f6ab0c1584b0aaff995be57e93c8ed38 (diff) | |
| download | pandoc-e80116c813ecfc8cde094cddd36a3b083c108fd8.tar.gz | |
Improved previous patch so it really solves the Windows issue.
Diffstat (limited to 'src/Text')
| -rw-r--r-- | src/Text/Pandoc/Shared.hs | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/Text/Pandoc/Shared.hs b/src/Text/Pandoc/Shared.hs index 001af6c6d..0780d4a60 100644 --- a/src/Text/Pandoc/Shared.hs +++ b/src/Text/Pandoc/Shared.hs @@ -105,7 +105,6 @@ 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 @@ -526,7 +525,7 @@ readDefaultDataFile fname = Nothing -> ioError $ userError $ "Data file `" ++ fname ++ "' does not exist" Just contents -> return contents - where makeCanonical = joinPath . transformPathParts . splitBy (=='/') + where makeCanonical = intercalate "/" . transformPathParts . splitBy (=='/') transformPathParts = reverse . foldl go [] go as "." = as go (_:as) ".." = as |