projects
/
ghc-hetmet.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
1f5536d
)
:edit runs notepad by default on Windows
author
Simon Marlow
<simonmar@microsoft.com>
Fri, 29 Sep 2006 10:27:39 +0000
(10:27 +0000)
committer
Simon Marlow
<simonmar@microsoft.com>
Fri, 29 Sep 2006 10:27:39 +0000
(10:27 +0000)
compiler/ghci/InteractiveUI.hs
patch
|
blob
|
history
diff --git
a/compiler/ghci/InteractiveUI.hs
b/compiler/ghci/InteractiveUI.hs
index
909eaec
..
0685168
100644
(file)
--- 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,
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
#ifndef mingw32_HOST_OS
import System.Posix
@@
-68,6
+69,7
@@
import System.Posix
#else
import GHC.ConsoleHandler ( flushConsole )
import System.Win32 ( setConsoleCP, setConsoleOutputCP )
#else
import GHC.ConsoleHandler ( flushConsole )
import System.Win32 ( setConsoleCP, setConsoleOutputCP )
+import qualified System.Win32
#endif
#ifdef USE_READLINE
#endif
#ifdef USE_READLINE
@@
-266,9
+268,8
@@
jumpFunction session@(Session ref) (I# idsPtr) hValues location b
findEditor = do
getEnv "EDITOR"
`IO.catch` \_ -> do
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 ""
return (win `joinFileName` "notepad.exe")
#else
return ""