aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--XMonad/Actions/Search.hs4
-rw-r--r--XMonad/Actions/WindowBringer.hs10
-rw-r--r--XMonad/Hooks/EwmhDesktops.hs2
-rw-r--r--XMonad/Layout/DecorationMadness.hs16
-rw-r--r--XMonad/Prompt/Window.hs2
-rw-r--r--XMonad/Util/Dmenu.hs10
-rw-r--r--XMonad/Util/Themes.hs16
-rw-r--r--xmonad-contrib.cabal2
8 files changed, 31 insertions, 31 deletions
diff --git a/XMonad/Actions/Search.hs b/XMonad/Actions/Search.hs
index 257cd27..c2c2a05 100644
--- a/XMonad/Actions/Search.hs
+++ b/XMonad/Actions/Search.hs
@@ -336,8 +336,8 @@ removeColonPrefix str = tail $ snd $ break (==':') str
{- | Makes a search engine prefix-aware. Especially useful together with '!>'.
It will automatically remove the prefix from a query so that you don\'t end
- up searching for google:xmonad if google is your fallback engine and you
- explicitly add the prefix. -}
+ up searching for google:xmonad if google is your fallback engine and you
+ explicitly add the prefix. -}
prefixAware :: SearchEngine -> SearchEngine
prefixAware (SearchEngine name site) = SearchEngine name (\s -> if s `hasPrefix` (name++":") then site $ removeColonPrefix s else site s)
diff --git a/XMonad/Actions/WindowBringer.hs b/XMonad/Actions/WindowBringer.hs
index 91bc0d1..449abab 100644
--- a/XMonad/Actions/WindowBringer.hs
+++ b/XMonad/Actions/WindowBringer.hs
@@ -15,11 +15,11 @@
-----------------------------------------------------------------------------
module XMonad.Actions.WindowBringer (
- -- * Usage
- -- $usage
- gotoMenu, gotoMenu', bringMenu, windowMap,
- bringWindow
- ) where
+ -- * Usage
+ -- $usage
+ gotoMenu, gotoMenu', bringMenu, windowMap,
+ bringWindow
+ ) where
import Data.Char (toLower)
import qualified Data.Map as M
diff --git a/XMonad/Hooks/EwmhDesktops.hs b/XMonad/Hooks/EwmhDesktops.hs
index d17c3c4..ade1b94 100644
--- a/XMonad/Hooks/EwmhDesktops.hs
+++ b/XMonad/Hooks/EwmhDesktops.hs
@@ -151,7 +151,7 @@ handle ClientMessageEvent {
else if mt == a_cw then do
killWindow w
else if mt `elem` a_ignore then do
- return ()
+ return ()
else trace $ "Unknown ClientMessageEvent " ++ show mt
handle _ = return ()
diff --git a/XMonad/Layout/DecorationMadness.hs b/XMonad/Layout/DecorationMadness.hs
index 91ae7bb..d428f89 100644
--- a/XMonad/Layout/DecorationMadness.hs
+++ b/XMonad/Layout/DecorationMadness.hs
@@ -541,12 +541,12 @@ mirrorTallTabbed s t = tabBar s t Top (resizeVertical (fi $ decoHeight t) mirror
--
-- <http://code.haskell.org/~arossato/xmonadShots/floatSimpleSimple.png>
floatSimpleSimple :: (Show a, Eq a) => ModifiedLayout (Decoration SimpleDecoration DefaultShrinker)
- (ModifiedLayout MouseResize (ModifiedLayout WindowArranger SimpleFloat)) a
+ (ModifiedLayout MouseResize (ModifiedLayout WindowArranger SimpleFloat)) a
floatSimpleSimple = simpleFloat
floatSimple :: (Show a, Eq a, Shrinker s) => s -> Theme ->
ModifiedLayout (Decoration SimpleDecoration s)
- (ModifiedLayout MouseResize (ModifiedLayout WindowArranger SimpleFloat)) a
+ (ModifiedLayout MouseResize (ModifiedLayout WindowArranger SimpleFloat)) a
floatSimple = simpleFloat'
-- | This version is decorated with the 'DefaultDecoration' style.
@@ -555,14 +555,14 @@ floatSimple = simpleFloat'
--
-- <http://code.haskell.org/~arossato/xmonadShots/floatSimpleDefault.png>
floatSimpleDefault :: (Show a, Eq a) => ModifiedLayout (Decoration DefaultDecoration DefaultShrinker)
- (ModifiedLayout MouseResize (ModifiedLayout WindowArranger SimpleFloat)) a
+ (ModifiedLayout MouseResize (ModifiedLayout WindowArranger SimpleFloat)) a
floatSimpleDefault = decoration shrinkText defaultTheme DefaultDecoration (mouseResize $ windowArrangeAll $ SF 20)
-- | Same as 'floatSimpleDefault', but with the possibility of setting a
-- custom shrinker and a custom theme.
floatDefault :: (Show a, Eq a, Shrinker s) => s -> Theme ->
ModifiedLayout (Decoration DefaultDecoration s)
- (ModifiedLayout MouseResize (ModifiedLayout WindowArranger SimpleFloat)) a
+ (ModifiedLayout MouseResize (ModifiedLayout WindowArranger SimpleFloat)) a
floatDefault s t = decoration s t DefaultDecoration (mouseResize $ windowArrangeAll $ SF (decoHeight t))
-- | This version is decorated with the 'DwmStyle'. Note that this is
@@ -572,14 +572,14 @@ floatDefault s t = decoration s t DefaultDecoration (mouseResize $ windowArrange
--
-- <http://code.haskell.org/~arossato/xmonadShots/floatSimpleDwmStyle.png>
floatSimpleDwmStyle :: (Show a, Eq a) => ModifiedLayout (Decoration DwmStyle DefaultShrinker)
- (ModifiedLayout MouseResize (ModifiedLayout WindowArranger SimpleFloat)) a
+ (ModifiedLayout MouseResize (ModifiedLayout WindowArranger SimpleFloat)) a
floatSimpleDwmStyle = decoration shrinkText defaultTheme Dwm (mouseResize $ windowArrangeAll $ SF 20)
-- | Same as 'floatSimpleDwmStyle', but with the possibility of setting a
-- custom shrinker and a custom theme.
floatDwmStyle :: (Show a, Eq a, Shrinker s) => s -> Theme ->
ModifiedLayout (Decoration DwmStyle s)
- (ModifiedLayout MouseResize (ModifiedLayout WindowArranger SimpleFloat)) a
+ (ModifiedLayout MouseResize (ModifiedLayout WindowArranger SimpleFloat)) a
floatDwmStyle s t = decoration s t Dwm (mouseResize $ windowArrangeAll $ SF (decoHeight t))
-- | This version is decorated with the 'TabbedDecoration' style.
@@ -589,12 +589,12 @@ floatDwmStyle s t = decoration s t Dwm (mouseResize $ windowArrangeAll $ SF (dec
--
-- <http://code.haskell.org/~arossato/xmonadShots/floatSimpleTabbed.png>
floatSimpleTabbed :: (Show a, Eq a) => ModifiedLayout (Decoration TabBarDecoration DefaultShrinker)
- (ModifiedLayout MouseResize (ModifiedLayout WindowArranger SimpleFloat)) a
+ (ModifiedLayout MouseResize (ModifiedLayout WindowArranger SimpleFloat)) a
floatSimpleTabbed = tabBar shrinkText defaultTheme Top (mouseResize $ windowArrangeAll $ SF 20)
-- | Same as 'floatSimpleTabbed', but with the possibility of setting a
-- custom shrinker and a custom theme.
floatTabbed :: (Show a, Eq a, Shrinker s) => s -> Theme ->
ModifiedLayout (Decoration TabBarDecoration s)
- (ModifiedLayout MouseResize (ModifiedLayout WindowArranger SimpleFloat)) a
+ (ModifiedLayout MouseResize (ModifiedLayout WindowArranger SimpleFloat)) a
floatTabbed s t = tabBar s t Top (mouseResize $ windowArrangeAll $ SF (decoHeight t))
diff --git a/XMonad/Prompt/Window.hs b/XMonad/Prompt/Window.hs
index 24c8e99..8130eaf 100644
--- a/XMonad/Prompt/Window.hs
+++ b/XMonad/Prompt/Window.hs
@@ -79,7 +79,7 @@ doPrompt t c = do
a <- case t of
Goto -> fmap gotoAction windowMap
Bring -> fmap bringAction windowMap
- BringCopy -> fmap bringCopyAction windowMap
+ BringCopy -> fmap bringCopyAction windowMap
wm <- windowMap
mkXPrompt t c (compList wm) a
diff --git a/XMonad/Util/Dmenu.hs b/XMonad/Util/Dmenu.hs
index 8a8dc08..fffba07 100644
--- a/XMonad/Util/Dmenu.hs
+++ b/XMonad/Util/Dmenu.hs
@@ -15,10 +15,10 @@
-----------------------------------------------------------------------------
module XMonad.Util.Dmenu (
- -- * Usage
- -- $usage
- dmenu, dmenuXinerama, dmenuMap, menu, menuMap
- ) where
+ -- * Usage
+ -- $usage
+ dmenu, dmenuXinerama, dmenuMap, menu, menuMap
+ ) where
import XMonad
import qualified XMonad.StackSet as W
@@ -53,4 +53,4 @@ menuMap menuCmd selectionMap = do
menuFunction = menu menuCmd
dmenuMap :: M.Map String a -> X (Maybe a)
-dmenuMap selectionMap = menuMap "dmenu" selectionMap \ No newline at end of file
+dmenuMap selectionMap = menuMap "dmenu" selectionMap
diff --git a/XMonad/Util/Themes.hs b/XMonad/Util/Themes.hs
index a47013d..e62c8d7 100644
--- a/XMonad/Util/Themes.hs
+++ b/XMonad/Util/Themes.hs
@@ -96,14 +96,14 @@ listOfThemes = [ xmonadTheme
, robertTheme
, donaldTheme
, wfarrTheme
- , kavonForestTheme
- , kavonLakeTheme
- , kavonPeacockTheme
- , kavonVioGreenTheme
- , kavonBluesTheme
- , kavonAutumnTheme
- , kavonFireTheme
- , kavonChristmasTheme
+ , kavonForestTheme
+ , kavonLakeTheme
+ , kavonPeacockTheme
+ , kavonVioGreenTheme
+ , kavonBluesTheme
+ , kavonAutumnTheme
+ , kavonFireTheme
+ , kavonChristmasTheme
]
-- | The default xmonad theme, by David Roundy.
diff --git a/xmonad-contrib.cabal b/xmonad-contrib.cabal
index a96772a..9161e33 100644
--- a/xmonad-contrib.cabal
+++ b/xmonad-contrib.cabal
@@ -54,7 +54,7 @@ library
extensions: ForeignFunctionInterface
if flag(testing)
- ghc-options: -Werror
+ ghc-options: -fwarn-tabs -Werror
if impl (ghc == 6.10.1) && arch (x86_64)
ghc-options: -O0