Compile with ghc7

2025-08-01 12:41:52 -07:00 · 2011-05-04 19:24:55 +00:00
parent 8056bb5c2c
commit 2ab79a7c35
6 changed files with 21 additions and 38 deletions
--- a/XMonad/Prompt.hs
+++ b/XMonad/Prompt.hs
@@ -442,12 +442,12 @@ defaultXPKeymap = M.fromList $
 keyPressHandle :: KeyMask -> KeyStroke -> XP ()
 keyPressHandle m (ks,str) = do
  km <- gets (promptKeymap . config)
-  mask <- cleanMask m
-  case M.lookup (mask,ks) km of
+  kmask <- cleanMask m -- mask is defined in ghc7
+  case M.lookup (kmask,ks) km of
    Just action -> action >> updateWindows
    Nothing -> case str of
                 "" -> eventLoop handle
-                 _ -> when (mask .&. controlMask == 0) $ do
+                 _ -> when (kmask .&. controlMask == 0) $ do
                                 insertString (decodeString str)
                                 updateWindows
                                 completed <- tryAutoComplete