diff options
| author | Adam Vogt <vogt.adam@gmail.com> | 2012-11-09 02:23:16 +0100 |
|---|---|---|
| committer | Adam Vogt <vogt.adam@gmail.com> | 2012-11-09 02:23:16 +0100 |
| commit | fff5ddb53f4eda07c3cbd1caae236e5edd8ea4bc (patch) | |
| tree | 9f158730016f24578b11960dee6a7dcb11961e38 /XMonad/Actions | |
| parent | f1c0b28a5c40186f8723772a9e30d1107a4c884b (diff) | |
| download | XMonadContrib-fff5ddb53f4eda07c3cbd1caae236e5edd8ea4bc.tar.gz XMonadContrib-fff5ddb53f4eda07c3cbd1caae236e5edd8ea4bc.tar.xz XMonadContrib-fff5ddb53f4eda07c3cbd1caae236e5edd8ea4bc.zip | |
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
Diffstat (limited to 'XMonad/Actions')
| -rw-r--r-- | XMonad/Actions/Plane.hs | 4 |
1 files changed, 2 insertions, 2 deletions
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 |