[commit: ghc] wip/merge-queue: Respect prompt in GhciSettings (08b8ea2)

[git at git.haskell.org]

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

On branch  : wip/merge-queue
Link       : http://ghc.haskell.org/trac/ghc/changeset/08b8ea2f4f1bbc1c61a7cca03ae7fa8ffb099556/ghc

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

commit 08b8ea2f4f1bbc1c61a7cca03ae7fa8ffb099556
Author: Zejun Wu <watashi at fb.com>
Date:   Tue Dec 18 18:29:44 2018 -0800

    Respect prompt in GhciSettings
    
    Summary:
    This was broken when PromptFunction was introduced that the settings are
    ignored and default values are always used.
    
    Test Plan: ./validate


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

08b8ea2f4f1bbc1c61a7cca03ae7fa8ffb099556
 ghc/GHCi/UI.hs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ghc/GHCi/UI.hs b/ghc/GHCi/UI.hs
index 105324f..2cc055a 100644
--- a/ghc/GHCi/UI.hs
+++ b/ghc/GHCi/UI.hs
@@ -468,8 +468,8 @@ interactiveUI config srcs maybe_exprs = do
         GHCiState{ progname           = default_progname,
                    args               = default_args,
                    evalWrapper        = eval_wrapper,
-                   prompt             = default_prompt,
-                   prompt_cont        = default_prompt_cont,
+                   prompt             = defPrompt config,
+                   prompt_cont        = defPromptCont config,
                    stop               = default_stop,
                    editor             = default_editor,
                    options            = [],