diff options
| author | Herbert Valerio Riedel <hvr@gnu.org> | 2013-08-24 11:40:57 +0200 |
|---|---|---|
| committer | Herbert Valerio Riedel <hvr@gnu.org> | 2013-08-24 11:40:57 +0200 |
| commit | 3229eadbff857b110f20ffddb80d5f7abd5d7216 (patch) | |
| tree | 00985ffdcf928437b9d4bb655af8c5af68138ca3 /ghc/InteractiveUI.hs | |
| parent | 27955ff375b36aea4bda688078b8758c342ebdb6 (diff) | |
| download | haskell-3229eadbff857b110f20ffddb80d5f7abd5d7216.tar.gz | |
Fix GHCi macros not shadowing builtins (#8113)
This restores the original behaviour that was broken accidentally during
the refactoring peformed via 4f764d06f3b9899c09a6a459a22d4be694ee45d9.
This has been broken effectively for all GHC 7.6.x releases.
Diffstat (limited to 'ghc/InteractiveUI.hs')
| -rw-r--r-- | ghc/InteractiveUI.hs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ghc/InteractiveUI.hs b/ghc/InteractiveUI.hs index fd034eaf7d..91648a31d1 100644 --- a/ghc/InteractiveUI.hs +++ b/ghc/InteractiveUI.hs @@ -958,7 +958,7 @@ lookupCommand' str' = do ghci_cmds <- ghci_commands `fmap` getGHCiState let{ (str, cmds) = case str' of ':' : rest -> (rest, ghci_cmds) -- "::" selects a builtin command - _ -> (str', ghci_cmds ++ macros) } -- otherwise prefer macros + _ -> (str', macros ++ ghci_cmds) } -- otherwise prefer macros -- look for exact match first, then the first prefix match return $ case [ c | c <- cmds, str == cmdName c ] of c:_ -> Just c |