From fff5ddb53f4eda07c3cbd1caae236e5edd8ea4bc Mon Sep 17 00:00:00 2001 From: Adam Vogt Date: Fri, 9 Nov 2012 02:23:16 +0100 Subject: Rename variables "state" to avoid warnings about shadowing Ignore-this: cd063d632412f758ca9fed6393521c8f XMonad core re-exports Control.Monad.State, which includes a function "state" if you happen to use mtl-2. Since there's a chance xmonad still works with mtl-1 avoid imports like: import XMonad hiding (state) darcs-hash:20121109012316-1499c-539514f4cd97ba8b18a8fbfd1a15333b46d962e1.gz --- XMonad/Actions/Plane.hs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'XMonad/Actions') diff --git a/XMonad/Actions/Plane.hs b/XMonad/Actions/Plane.hs index 8126d41..3037719 100644 --- a/XMonad/Actions/Plane.hs +++ b/XMonad/Actions/Plane.hs @@ -110,7 +110,7 @@ plane :: (WorkspaceId -> WindowSet -> WindowSet) -> Lines -> Limits -> Direction -> X () plane function numberLines_ limits direction = do - state <- get + st <- get xconf <- ask numberLines <- @@ -205,7 +205,7 @@ plane function numberLines_ limits direction = do preColumns = div areas numberLines mCurrentWS :: Maybe Int - mCurrentWS = elemIndex (currentTag $ windowset state) areaNames + mCurrentWS = elemIndex (currentTag $ windowset st) areaNames areas :: Int areas = length areaNames -- cgit v1.2.3