[commit: packages/haskeline] master: Merge branch 'master' into bump-lower-dep (3600181)

[git at git.haskell.org]

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

On branch  : master
Link       : http://git.haskell.org/packages/haskeline.git/commitdiff/3600181d0a5f10a8cfc64155f5b5ae86aa769cd9

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

commit 3600181d0a5f10a8cfc64155f5b5ae86aa769cd9
Merge: a89ecc1 cec24a1
Author: Judah Jacobson <judah.jacobson at gmail.com>
Date:   Sun Apr 24 09:50:02 2016 -0700

    Merge branch 'master' into bump-lower-dep
    
    Conflicts:
    	README.md
    	System/Console/Haskeline/Backend/Posix.hsc
    	haskeline.cabal



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

3600181d0a5f10a8cfc64155f5b5ae86aa769cd9
 README.md                                  |  2 +-
 System/Console/Haskeline.hs                | 11 +++++++++
 System/Console/Haskeline/Backend/Posix.hsc | 11 +++++----
 System/Console/Haskeline/Backend/Win32.hsc | 26 ++++++++++----------
 System/Console/Haskeline/Emacs.hs          |  2 +-
 System/Console/Haskeline/RunCommand.hs     |  8 +++++++
 System/Console/Haskeline/Term.hs           | 38 +++++++++++++++++++++++-------
 haskeline.cabal                            |  1 +
 8 files changed, 72 insertions(+), 27 deletions(-)

diff --cc System/Console/Haskeline/Backend/Posix.hsc
index 0271a7f,c83d28b..865c095
--- a/System/Console/Haskeline/Backend/Posix.hsc
+++ b/System/Console/Haskeline/Backend/Posix.hsc
@@@ -284,23 -279,29 +284,26 @@@ posixRunTerm :
  posixRunTerm hs layoutGetters keys wrapGetEvent evalBackend = do
      ch <- newChan
      fileRT <- posixFileRunTerm hs
 -    (enc,dec) <- newEncoders
      return fileRT
-                 { closeTerm = closeTerm fileRT
-                 , termOps = Left TermOps
+                 { termOps = Left TermOps
                              { getLayout = tryGetLayouts layoutGetters
                              , withGetEvent = wrapGetEvent
 -                                            . withPosixGetEvent ch hs dec
 +                                            . withPosixGetEvent ch hs
                                                  keys
                              , saveUnusedKeys = saveKeys ch
-                             , evalTerm =
-                                     mapEvalTerm (runPosixT hs) lift evalBackend
+                             , evalTerm = mapEvalTerm
 -                                            (runPosixT enc hs)
 -                                                (lift . lift)
 -                                            evalBackend
++                                            (runPosixT hs) lift evalBackend
+                             , externalPrint = writeChan ch . ExternalPrint
                              }
+                 , closeTerm = do
+                     flushEventQueue (putStrOut fileRT) ch
+                     closeTerm fileRT
                  }
  
 -type PosixT m = ReaderT Encoder (ReaderT Handles m)
 +type PosixT m = ReaderT Handles m
  
 -runPosixT :: Monad m => Encoder -> Handles -> PosixT m a -> m a
 -runPosixT enc h = runReaderT' h . runReaderT' enc
 +runPosixT :: Monad m => Handles -> PosixT m a -> m a
 +runPosixT h = runReaderT' h
  
  fileRunTerm :: Handle -> IO RunTerm
  fileRunTerm h_in = posixFileRunTerm Handles
diff --cc haskeline.cabal
index b5478ca,ea41164..af32974
--- a/haskeline.cabal
+++ b/haskeline.cabal
@@@ -16,8 -16,9 +16,9 @@@ Description
                  Haskell programs.
                  .
                  Haskeline runs both on POSIX-compatible systems and on Windows.
 -Homepage:       https://github.com/judah/haskeline
 +Homepage:       http://trac.haskell.org/haskeline
+ Bug-Reports:    https://github.com/judah/haskeline/issues
 -Stability:      Experimental
 +Stability:      Stable
  Build-Type:     Custom
  extra-source-files: examples/Test.hs Changelog