diff options
| author | Sam Anklesaria <amsay@amsay.net> | 2011-06-19 17:36:07 -0500 |
|---|---|---|
| committer | Ian Lynagh <igloo@earth.li> | 2011-06-26 22:24:12 +0100 |
| commit | 991f141989940c897cb2fc3dba7b5b49342d402a (patch) | |
| tree | 34d666df6354c99c31bc6bcb281b64c31990cbb2 /ghc/InteractiveUI.hs | |
| parent | 8023014ecf192381ffba4b60a3dd21630e5c1d18 (diff) | |
| download | haskell-991f141989940c897cb2fc3dba7b5b49342d402a.tar.gz | |
trac #5265 (support for additional .ghci files)
Diffstat (limited to 'ghc/InteractiveUI.hs')
| -rw-r--r-- | ghc/InteractiveUI.hs | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/ghc/InteractiveUI.hs b/ghc/InteractiveUI.hs index 1869040a80..981abdfe79 100644 --- a/ghc/InteractiveUI.hs +++ b/ghc/InteractiveUI.hs @@ -426,7 +426,8 @@ runGHCi paths maybe_exprs = do getDirectory f = case takeDirectory f of "" -> "."; d -> d when (read_dot_files) $ do - mcfgs0 <- sequence [ current_dir, app_user_dir, home_dir ] + mcfgs0 <- sequence $ [ current_dir, app_user_dir, home_dir ] + ++ map (return . Just) opt_GhciScripts mcfgs <- liftIO $ mapM canonicalizePath' (catMaybes mcfgs0) mapM_ sourceConfigFile $ nub $ catMaybes mcfgs -- nub, because we don't want to read .ghci twice if the |