[commit: packages/haskeline] ghc-head: Fix build on ghc-6.12.3. (8252f06)

[git at git.haskell.org]

Repository : ssh://git@git.haskell.org/haskeline

On branch  : ghc-head
Link       : http://git.haskell.org/?p=packages/haskeline.git;a=commit;h=8252f06489ed090c1002505caf7c917661aacb7e

>---------------------------------------------------------------

commit 8252f06489ed090c1002505caf7c917661aacb7e
Author: Judah Jacobson <judah.jacobson at gmail.com>
Date:   Sun Jan 20 19:31:35 2013 +0000

    Fix build on ghc-6.12.3.


>---------------------------------------------------------------

8252f06489ed090c1002505caf7c917661aacb7e
 System/Console/Haskeline/Backend/Terminfo.hs |    4 +++-
 System/Console/Haskeline/RunCommand.hs       |    7 +++++--
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/System/Console/Haskeline/Backend/Terminfo.hs b/System/Console/Haskeline/Backend/Terminfo.hs
index 7c7fad2..18f1150 100644
--- a/System/Console/Haskeline/Backend/Terminfo.hs
+++ b/System/Console/Haskeline/Backend/Terminfo.hs
@@ -194,7 +194,9 @@ runActionT m = do
     return x
 
 output :: TermAction -> ActionM ()
-output = Writer.tell
+output t = Writer.tell t  -- NB: explicit argument enables build with ghc-6.12.3
+                          -- (Probably related to the monomorphism restriction;
+                          -- see GHC ticket #1749).
 
 outputText :: String -> ActionM ()
 outputText str = do
diff --git a/System/Console/Haskeline/RunCommand.hs b/System/Console/Haskeline/RunCommand.hs
index 01ad96d..33c81dd 100644
--- a/System/Console/Haskeline/RunCommand.hs
+++ b/System/Console/Haskeline/RunCommand.hs
@@ -11,8 +11,11 @@ import Control.Monad
 
 runCommandLoop :: (CommandMonad m, MonadState Layout m, LineState s)
     => TermOps -> String -> KeyCommand m s a -> s -> m a
-runCommandLoop tops at TermOps{evalTerm = EvalTerm eval liftE} prefix cmds initState
-    = eval $ withGetEvent tops
+runCommandLoop tops at TermOps{evalTerm = e} prefix cmds initState
+    = case e of -- NB: Need to separate this case out from the above pattern
+                -- in order to build on ghc-6.12.3
+        EvalTerm eval liftE
+            -> eval $ withGetEvent tops
                 $ runCommandLoop' liftE tops (stringToGraphemes prefix) initState 
                     cmds