Ticket #1189: patch-InteractiveUI.hs

--- ghc/compiler/ghci/InteractiveUI.hs.sav      Mon Jul 21 10:52:28 2003
+++ ghc/compiler/ghci/InteractiveUI.hs  Tue Aug 26 12:57:29 2003
@@ -229,32 +229,28 @@
        loadModule paths
 
   -- enter the interactive loop
-#if defined(mingw32_HOST_OS)
-   -- Always show prompt, since hIsTerminalDevice returns True for Consoles
-   -- only, which we may or may not be running under (cf. Emacs sub-shells.)
-  interactiveLoop True
-#else
+  -- if verbosity is greater than 0, display the prompt.
+  let show_prompt = verbosity dflags > 0
   is_tty <- io (hIsTerminalDevice stdin)
-  interactiveLoop is_tty
-#endif
+  interactiveLoop is_tty show_prompt
 
   -- and finally, exit
-  io $ do when (verbosity dflags > 0) $ putStrLn "Leaving GHCi."
+  io $ do when (show_prompt) $ putStrLn "Leaving GHCi."
 
 
-interactiveLoop is_tty = do
+interactiveLoop is_tty show_prompt = do
   -- Ignore ^C exceptions caught here
   ghciHandleDyn (\e -> case e of 
-                       Interrupted -> ghciUnblock (interactiveLoop is_tty)
+                       Interrupted -> ghciUnblock (interactiveLoop is_tty show_prompt)
                        _other      -> return ()) $ do
 
   -- read commands from stdin
 #if HAVE_READLINE_HEADERS && HAVE_READLINE_LIBS
   if (is_tty) 
        then readlineLoop
-       else fileLoop stdin False  -- turn off prompt for non-TTY input
+       else fileLoop stdin show_prompt
 #else
-  fileLoop stdin is_tty
+  fileLoop stdin show_prompt
 #endif