From 671f40ba18efd1182c6ad93892064120f89ab1a6 Mon Sep 17 00:00:00 2001
From: David Roundy <droundy@darcs.net>
Date: Tue, 12 Jun 2007 19:06:25 +0200
Subject: resolve conflict in Operations.

darcs-hash:20070612170625-72aca-5d5ae145d30e5e9e971add6e906f6da30d214834
---
 Operations.hs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'Operations.hs')

diff --git a/Operations.hs b/Operations.hs
index fd85106..0a112b4 100644
--- a/Operations.hs
+++ b/Operations.hs
@@ -145,7 +145,8 @@ windows f = do
             this   = W.view n ws
             Just l = fmap fst $ M.lookup n fls
             flt = filter (flip M.member (W.floating ws)) (W.index this)
-            tiled = W.filter (not . flip M.member (W.floating ws)) . W.stack . W.workspace . W.current $ this
+            tiled = (W.stack . W.workspace . W.current $ this)
+                    >>= W.filter (not . flip M.member (W.floating ws))
             (Rectangle sx sy sw sh) = genericIndex xinesc (W.screen w)
             (gt,gb,gl,gr)           = genericIndex gaps   (W.screen w)
             viewrect = Rectangle (sx + fromIntegral gl)        (sy + fromIntegral gt)
-- 
cgit v1.2.3