diff options
| author | Adam Vogt <vogt.adam@gmail.com> | 2010-11-16 00:26:54 +0100 |
|---|---|---|
| committer | Adam Vogt <vogt.adam@gmail.com> | 2010-11-16 00:26:54 +0100 |
| commit | 790fd3ad02aa70296ee458a02193154c899f6886 (patch) | |
| tree | b3186ebf259a64f5c691b4fa8391ea2e48300127 | |
| parent | f0088e4fa88da36624e3b8fd11b8e95eebfc9fe3 (diff) | |
| download | XMonadContrib-790fd3ad02aa70296ee458a02193154c899f6886.tar.gz XMonadContrib-790fd3ad02aa70296ee458a02193154c899f6886.tar.xz XMonadContrib-790fd3ad02aa70296ee458a02193154c899f6886.zip | |
Compatibility with mtl-1 and mtl-2
Ignore-this: 4fb7f279365992fe9e73388b0f4001ac
darcs-hash:20101115232654-1499c-411b53c153acbcbf791150e3923a754abe530202.gz
Diffstat (limited to '')
| -rw-r--r-- | XMonad/Layout/HintedGrid.hs | 2 | ||||
| -rw-r--r-- | XMonad/Util/CustomKeys.hs | 2 | ||||
| -rw-r--r-- | xmonad-contrib.cabal | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/XMonad/Layout/HintedGrid.hs b/XMonad/Layout/HintedGrid.hs index 0d9e17d..e7e09d5 100644 --- a/XMonad/Layout/HintedGrid.hs +++ b/XMonad/Layout/HintedGrid.hs @@ -65,7 +65,7 @@ instance LayoutClass Grid Window where doLayout (GridRatio d m) r w = flip (,) Nothing . arrange d m r (integrate w) 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 width height k adjs = diff --git a/XMonad/Util/CustomKeys.hs b/XMonad/Util/CustomKeys.hs index 998f9bc..e2e73ef 100644 --- a/XMonad/Util/CustomKeys.hs +++ b/XMonad/Util/CustomKeys.hs @@ -77,7 +77,7 @@ customize :: XConfig l -> (XConfig Layout -> [(KeyMask, KeySym)]) -> (XConfig Layout -> [((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 dels kmap = asks dels >>= return . foldr M.delete kmap diff --git a/xmonad-contrib.cabal b/xmonad-contrib.cabal index f153c24..ae150ff 100644 --- a/xmonad-contrib.cabal +++ b/xmonad-contrib.cabal @@ -56,7 +56,7 @@ library extensions: ForeignFunctionInterface 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 ghc-options: -fwarn-tabs -Wall |