From cc2ee817cbb4ca1df6e2e8363da69f9d91189092 Mon Sep 17 00:00:00 2001
From: Adam Vogt <vogt.adam@gmail.com>
Date: Sun, 5 Jul 2009 19:51:45 +0200
Subject: Reduce a bit of recently introduced duplication in L.SubLayouts

Ignore-this: e87a5643938183eff156e08646cc71ac

darcs-hash:20090705175145-1499c-2c3ffac4ccbec1b5b6d0101e8a0aa714898b5547.gz
---
 XMonad/Layout/SubLayouts.hs | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

(limited to 'XMonad/Layout/SubLayouts.hs')

diff --git a/XMonad/Layout/SubLayouts.hs b/XMonad/Layout/SubLayouts.hs
index 2cd2a8a..141e2ab 100644
--- a/XMonad/Layout/SubLayouts.hs
+++ b/XMonad/Layout/SubLayouts.hs
@@ -352,12 +352,10 @@ instance (Read (l Window), Show (l Window), LayoutClass l Window) => LayoutModif
             in fgs $ M.unions $ map mkSingleton ws
 
         | Just (Merge x y) <- fromMessage m
-        , let findGrp z = mplus (M.lookup z gs) $ listToMaybe
-                $ M.elems $ M.filter ((z `elem`) . W.integrate) gs
-        , Just (W.Stack _ xb xn) <- findGrp x
-        , Just yst <- findGrp y =
+        , Just (W.Stack _ xb xn) <- findGroup x
+        , Just yst <- findGroup y =
             let zs = W.Stack x xb (xn ++ W.integrate yst)
-            in fgs $ M.update (\_ -> Just zs) x $ M.delete y gs
+            in fgs $ M.insert x zs $ M.delete (W.focus yst) gs
 
         | Just (UnMerge x) <- fromMessage m =
             fgs . M.fromList . map (W.focus &&& id) . M.elems
-- 
cgit v1.2.3