Follow changes in editline
authorIan Lynagh <igloo@earth.li>
Mon, 17 Mar 2008 10:36:17 +0000 (10:36 +0000)
committerIan Lynagh <igloo@earth.li>
Mon, 17 Mar 2008 10:36:17 +0000 (10:36 +0000)
compiler/ghci/InteractiveUI.hs

index ed90e99..fbc5354 100644 (file)
@@ -317,10 +317,9 @@ interactiveUI session srcs maybe_exprs = do
         when is_tty $ do
             Readline.initialize
 
         when is_tty $ do
             Readline.initialize
 
-            -- XXX Should we be catching exceptions thrown by readHistory?
             withGhcAppData
                  (\dir -> Readline.readHistory (dir </> "ghci_history"))
             withGhcAppData
                  (\dir -> Readline.readHistory (dir </> "ghci_history"))
-                 (return ())
+                 (return True)
             
             Readline.setAttemptedCompletionFunction (Just completeWord)
             --Readline.parseAndBind "set show-all-if-ambiguous 1"
             
             Readline.setAttemptedCompletionFunction (Just completeWord)
             --Readline.parseAndBind "set show-all-if-ambiguous 1"
@@ -356,9 +355,8 @@ interactiveUI session srcs maybe_exprs = do
 
 #ifdef USE_EDITLINE
    Readline.stifleHistory 100
 
 #ifdef USE_EDITLINE
    Readline.stifleHistory 100
-   -- XXX Should we be catching exceptions thrown by readHistory?
    withGhcAppData (\dir -> Readline.writeHistory (dir </> "ghci_history"))
    withGhcAppData (\dir -> Readline.writeHistory (dir </> "ghci_history"))
-                  (return ())
+                  (return True)
    Readline.resetTerminal Nothing
 #endif
 
    Readline.resetTerminal Nothing
 #endif