twin/xmonad-contrib
1
0
Fork 0
mirror of https://github.com/xmonad/xmonad-contrib.git synced 2025-05-19 03:20:21 -07:00
Code Issues Packages Projects Releases Wiki Activity

Compatibility with mtl-1 and mtl-2

Browse Source
This commit is contained in:
Adam Vogt 2010-11-15 23:26:54 +00:00
parent 52d3aa1500
commit 67db59bf73
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
XMonad/Layout/HintedGrid.hs
View File

@ -65,7 +65,7 @@ instance LayoutClass Grid Window where
doLayout (GridRatio d m) r w = flip (,) Nothing . arrange d m r (integrate w) doLayout (GridRatio d m) r w = flip (,) Nothing . arrange d m r (integrate w)
replicateS :: Int -> (a -> (b, a)) -> a -> ([b], a) replicateS :: Int -> (a -> (b, a)) -> a -> ([b], a)
replicateS n = runState . replicateM n . State replicateS n f = runState . replicateM n $ do (a,s) <- gets f; put s; return a
doColumn :: Dimension -> Dimension -> Dimension -> [(D -> D)] -> [D] doColumn :: Dimension -> Dimension -> Dimension -> [(D -> D)] -> [D]
doColumn width height k adjs = doColumn width height k adjs =

2
XMonad/Util/CustomKeys.hs
View File

@ -77,7 +77,7 @@ customize :: XConfig l
-> (XConfig Layout -> [(KeyMask, KeySym)]) -> (XConfig Layout -> [(KeyMask, KeySym)])
-> (XConfig Layout -> [((KeyMask, KeySym), X ())]) -> (XConfig Layout -> [((KeyMask, KeySym), X ())])
-> Reader (XConfig Layout) (M.Map (KeyMask, KeySym) (X ())) -> Reader (XConfig Layout) (M.Map (KeyMask, KeySym) (X ()))
customize conf ds is = Reader (keys conf) >>= delete ds >>= insert is customize conf ds is = asks (keys conf) >>= delete ds >>= insert is
delete :: (MonadReader r m, Ord a) => (r -> [a]) -> M.Map a b -> m (M.Map a b) delete :: (MonadReader r m, Ord a) => (r -> [a]) -> M.Map a b -> m (M.Map a b)
delete dels kmap = asks dels >>= return . foldr M.delete kmap delete dels kmap = asks dels >>= return . foldr M.delete kmap

2
xmonad-contrib.cabal
View File

@ -56,7 +56,7 @@ library
extensions: ForeignFunctionInterface extensions: ForeignFunctionInterface
cpp-options: -DXFT cpp-options: -DXFT
build-depends: mtl < 2, unix, X11>=1.5.0.0 && < 1.6, xmonad>=0.9.1, xmonad<0.10, utf8-string build-depends: mtl >= 1 && < 3, unix, X11>=1.5.0.0 && < 1.6, xmonad>=0.9.1, xmonad<0.10, utf8-string
if true if true
ghc-options: -fwarn-tabs -Wall ghc-options: -fwarn-tabs -Wall