projects
/
ghc-hetmet.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(from parent 1:
9fc0566
)
FIX BUILD: GHC doesn't use filepath (yet)
author
Simon Marlow
<simonmar@microsoft.com>
Mon, 21 May 2007 14:17:45 +0000
(14:17 +0000)
committer
Simon Marlow
<simonmar@microsoft.com>
Mon, 21 May 2007 14:17:45 +0000
(14:17 +0000)
compiler/ghci/InteractiveUI.hs
patch
|
blob
|
history
diff --git
a/compiler/ghci/InteractiveUI.hs
b/compiler/ghci/InteractiveUI.hs
index
98baccd
..
0f80fa2
100644
(file)
--- a/
compiler/ghci/InteractiveUI.hs
+++ b/
compiler/ghci/InteractiveUI.hs
@@
-70,7
+70,6
@@
import System.Exit ( exitWith, ExitCode(..) )
import System.Directory
import System.IO
import System.IO.Error as IO
-import System.FilePath
import Data.Char
import Data.Dynamic
import Data.Array
@@
-1794,7
+1793,7
@@
listModuleLine modl line = do
-- start_bold/end_bold.
listAround span do_highlight = do
pwd <- getEnv "PWD"
- contents <- BS.readFile (pwd </> unpackFS file)
+ contents <- BS.readFile (pwd `joinFileName` unpackFS file)
let
lines = BS.split '\n' contents
these_lines = take (line2 - line1 + 1 + pad_before + pad_after) $