From f8a11e8f42e7f80bc124ec4b040a31e161d39813 Mon Sep 17 00:00:00 2001 From: Don Stewart Date: Fri, 7 Mar 2008 19:16:34 +0100 Subject: rework failure cases in StackSet.view darcs-hash:20080307181634-cba2c-66088abef9a3e448dd6043cf4aefa4eb275c5a44.gz --- XMonad/StackSet.hs | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/XMonad/StackSet.hs b/XMonad/StackSet.hs index d9e7e6b..20cafe2 100644 --- a/XMonad/StackSet.hs +++ b/XMonad/StackSet.hs @@ -210,8 +210,7 @@ new _ _ _ = abort "non-positive argument to StackSet.new" view :: (Eq s, Eq i) => i -> StackSet i l a s sd -> StackSet i l a s sd view i s - | not (i `tagMember` s) - || i == tag (workspace (current s)) = s -- out of bounds or current + | i == tag (workspace (current s)) = s -- current | Just x <- L.find ((i==).tag.workspace) (visible s) -- if it is visible, it is just raised @@ -222,7 +221,7 @@ view i s = s { current = (current s) { workspace = x } , hidden = workspace (current s) : L.deleteBy (equating tag) x (hidden s) } - | otherwise = s -- can't happen: all workspaces are either invalid, current, visible, or hidden + | otherwise = s -- not a member of the stackset where equating f = \x y -> f x == f y -- cgit v1.2.3