X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=compiler%2Fghci%2FInteractiveUI.hs;h=0685168e3dfa11eb3674ca41eda4fa4bfeeef798;hb=f80b81f8b56ebd0fa0f7f82494a5090e9ab64256;hp=909eaeca0a273bb1667fcff76a134557b057e43d;hpb=1f5536dd423a71d721b7c9563f4680c4f798ebe8;p=ghc-hetmet.git diff --git a/compiler/ghci/InteractiveUI.hs b/compiler/ghci/InteractiveUI.hs index 909eaec..0685168 100644 --- a/compiler/ghci/InteractiveUI.hs +++ b/compiler/ghci/InteractiveUI.hs @@ -58,7 +58,8 @@ import Config import StaticFlags ( opt_IgnoreDotGhci ) import Linker ( showLinkerState, linkPackages ) import Util ( removeSpaces, handle, global, toArgs, - looksLikeModuleName, prefixMatch, sortLe ) + looksLikeModuleName, prefixMatch, sortLe, + joinFileName ) #ifndef mingw32_HOST_OS import System.Posix @@ -68,6 +69,7 @@ import System.Posix #else import GHC.ConsoleHandler ( flushConsole ) import System.Win32 ( setConsoleCP, setConsoleOutputCP ) +import qualified System.Win32 #endif #ifdef USE_READLINE @@ -266,9 +268,8 @@ jumpFunction session@(Session ref) (I# idsPtr) hValues location b findEditor = do getEnv "EDITOR" `IO.catch` \_ -> do -#if 0 - -- ToDo: mingw32_HOST_OS - win <- getWindowsDirectory +#if mingw32_HOST_OS + win <- System.Win32.getWindowsDirectory return (win `joinFileName` "notepad.exe") #else return ""