diff options
| author | Adam Vogt <vogt.adam@gmail.com> | 2010-01-24 21:21:36 +0100 |
|---|---|---|
| committer | Adam Vogt <vogt.adam@gmail.com> | 2010-01-24 21:21:36 +0100 |
| commit | c37ed1835d53cfb73a7b36019fe8d4fb315cd502 (patch) | |
| tree | a215db82c3be8d426bf4f2635c926e58e7a3fdd2 /XMonad | |
| parent | 0862f36a4f6ff4943eccb52797488da1b1d5947d (diff) | |
| download | XMonadContrib-c37ed1835d53cfb73a7b36019fe8d4fb315cd502.tar.gz XMonadContrib-c37ed1835d53cfb73a7b36019fe8d4fb315cd502.tar.xz XMonadContrib-c37ed1835d53cfb73a7b36019fe8d4fb315cd502.zip | |
Use <+> instead of explicit M.union to merge keybindings in X.C.*
Ignore-this: e7bfd99eb4d3e6735153d1d5ec00a885
darcs-hash:20100124202136-1499c-0a4fde78c7e14b6d473712e8d6e23382232b1908.gz
Diffstat (limited to 'XMonad')
| -rw-r--r-- | XMonad/Config/Azerty.hs | 2 | ||||
| -rw-r--r-- | XMonad/Config/Desktop.hs | 2 | ||||
| -rw-r--r-- | XMonad/Config/Gnome.hs | 2 | ||||
| -rw-r--r-- | XMonad/Config/Kde.hs | 4 | ||||
| -rw-r--r-- | XMonad/Config/Xfce.hs | 2 |
5 files changed, 6 insertions, 6 deletions
diff --git a/XMonad/Config/Azerty.hs b/XMonad/Config/Azerty.hs index 478bf19..2d6c3d1 100644 --- a/XMonad/Config/Azerty.hs +++ b/XMonad/Config/Azerty.hs @@ -38,7 +38,7 @@ import qualified Data.Map as M -- > import qualified Data.Map as M -- > main = xmonad someConfig { keys = \c -> azertyKeys c `M.union` keys someConfig c } -azertyConfig = defaultConfig { keys = \c -> azertyKeys c `M.union` keys defaultConfig c } +azertyConfig = defaultConfig { keys = azertyKeys <+> keys defaultConfig } azertyKeys conf@(XConfig {modMask = modm}) = M.fromList $ [((modm, xK_semicolon), sendMessage (IncMasterN (-1)))] diff --git a/XMonad/Config/Desktop.hs b/XMonad/Config/Desktop.hs index b57ea0e..af00f8b 100644 --- a/XMonad/Config/Desktop.hs +++ b/XMonad/Config/Desktop.hs @@ -170,7 +170,7 @@ desktopConfig = ewmh defaultConfig { startupHook = setDefaultCursor xC_left_ptr , layoutHook = desktopLayoutModifiers $ layoutHook defaultConfig , manageHook = manageHook defaultConfig <+> manageDocks - , keys = \c -> desktopKeys c `M.union` keys defaultConfig c } + , keys = desktopKeys <+> keys defaultConfig } desktopKeys (XConfig {modMask = modm}) = M.fromList $ [ ((modm, xK_b), sendMessage ToggleStruts) ] diff --git a/XMonad/Config/Gnome.hs b/XMonad/Config/Gnome.hs index 8fa6b36..9c480bc 100644 --- a/XMonad/Config/Gnome.hs +++ b/XMonad/Config/Gnome.hs @@ -41,7 +41,7 @@ import System.Environment (getEnvironment) gnomeConfig = desktopConfig { terminal = "gnome-terminal" - , keys = \c -> gnomeKeys c `M.union` keys desktopConfig c + , keys = gnomeKeys <+> keys desktopConfig , startupHook = gnomeRegister >> startupHook desktopConfig } gnomeKeys (XConfig {modMask = modm}) = M.fromList $ diff --git a/XMonad/Config/Kde.hs b/XMonad/Config/Kde.hs index 33daf65..bda58a4 100644 --- a/XMonad/Config/Kde.hs +++ b/XMonad/Config/Kde.hs @@ -40,11 +40,11 @@ import qualified Data.Map as M kdeConfig = desktopConfig { terminal = "konsole" - , keys = \c -> kdeKeys c `M.union` keys desktopConfig c } + , keys = kdeKeys <+> keys desktopConfig } kde4Config = desktopConfig { terminal = "konsole" - , keys = \c -> kde4Keys c `M.union` keys desktopConfig c } + , keys = kde4Keys <+> keys desktopConfig } kdeKeys (XConfig {modMask = modm}) = M.fromList $ [ ((modm, xK_p), spawn "dcop kdesktop default popupExecuteCommand") diff --git a/XMonad/Config/Xfce.hs b/XMonad/Config/Xfce.hs index 6b2bd55..c6bca4c 100644 --- a/XMonad/Config/Xfce.hs +++ b/XMonad/Config/Xfce.hs @@ -36,7 +36,7 @@ import qualified Data.Map as M xfceConfig = desktopConfig { terminal = "Terminal" - , keys = \c -> xfceKeys c `M.union` keys desktopConfig c } + , keys = xfceKeys <+> keys desktopConfig } xfceKeys (XConfig {modMask = modm}) = M.fromList $ [ ((modm, xK_p), spawn "xfrun4") |