[commit: base] encoding: Fix the Windows code path for the CodingFailureMode story (8730aee)

[Max Bolingbroke]

Repository : ssh://darcs.haskell.org//srv/darcs/packages/base

On branch  : encoding

http://hackage.haskell.org/trac/ghc/changeset/8730aee195e931f5c895010d1ec4a4395c8bc00e

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

commit 8730aee195e931f5c895010d1ec4a4395c8bc00e
Author: Max Bolingbroke <batterseapower at hotmail.com>
Date:   Mon Apr 11 18:54:54 2011 +0100

    Fix the Windows code path for the CodingFailureMode story

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

 GHC/IO/Encoding.hs          |    2 +-
 GHC/IO/Encoding/CodePage.hs |    3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/GHC/IO/Encoding.hs b/GHC/IO/Encoding.hs
index b92c6c7..953fc2e 100644
--- a/GHC/IO/Encoding.hs
+++ b/GHC/IO/Encoding.hs
@@ -163,7 +163,7 @@ mkTextEncoding e = case mb_coding_failure_mode of
     "UTF-32LE" -> return $ UTF32.mkUTF32le cfm
     "UTF-32BE" -> return $ UTF32.mkUTF32be cfm
 #if defined(mingw32_HOST_OS)
-    'C':'P':n | [(cp,"")] <- reads n -> return $ CodePage.mkCodePageEncoding cp cfm
+    'C':'P':n | [(cp,"")] <- reads n -> return $ CodePage.mkCodePageEncoding cfm cp
     _ -> unknown_encoding
 #else
     _ -> Iconv.mkIconvEncoding cfm enc
diff --git a/GHC/IO/Encoding/CodePage.hs b/GHC/IO/Encoding/CodePage.hs
index 4573c49..a6b4e95 100644
--- a/GHC/IO/Encoding/CodePage.hs
+++ b/GHC/IO/Encoding/CodePage.hs
@@ -17,7 +17,6 @@ import GHC.IO (unsafePerformIO)
 import GHC.IO.Encoding.Failure
 import GHC.IO.Encoding.Types
 import GHC.IO.Buffer
-import GHC.IO.Exception
 import Data.Bits
 import Data.Maybe
 import Data.List (lookup)
@@ -53,7 +52,7 @@ localeEncoding :: TextEncoding
 localeEncoding = mkLocaleEncoding ErrorOnCodingFailure
 
 mkLocaleEncoding :: CodingFailureMode -> TextEncoding
-mkLocaleEncoding = mkCodePageEncoding currentCodePage
+mkLocaleEncoding cfm = mkCodePageEncoding cfm currentCodePage
 
 
 codePageEncoding :: Word32 -> TextEncoding