diff options
| author | John MacFarlane <fiddlosopher@gmail.com> | 2013-04-20 10:09:17 -0700 |
|---|---|---|
| committer | John MacFarlane <fiddlosopher@gmail.com> | 2013-04-20 10:09:17 -0700 |
| commit | 3c1a8d1924b89992ff06419fc2cad54f6d0f12b9 (patch) | |
| tree | 82476946e3cd6e08f233ac8c7b78a8579df156c5 /src/Text/Pandoc | |
| parent | e80116c813ecfc8cde094cddd36a3b083c108fd8 (diff) | |
| download | pandoc-3c1a8d1924b89992ff06419fc2cad54f6d0f12b9.tar.gz | |
Revert "Improved previous patch so it really solves the Windows issue."
This reverts commit e80116c813ecfc8cde094cddd36a3b083c108fd8.
Diffstat (limited to 'src/Text/Pandoc')
| -rw-r--r-- | src/Text/Pandoc/Shared.hs | 3 |
1 files changed, 2 insertions, 1 deletions
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 |