depend on data-default, and deprecate the monomorphic name defaultConfig

Ignore-this: 1e746731695df3b6f684d5463a3da6a4

darcs-hash:20130528003531-76d51-cb0d530829e7ad54445399456421f3fa7fe231df.gz

1 files changed, 7 insertions, 0 deletions

diff --git a/XMonad/Core.hs b/XMonad/Core.hs
index 569f9f9..112d1e4 100644
--- a/XMonad/Core.hs
+++ b/XMonad/Core.hs
@@ -37,6 +37,7 @@ import Control.Exception.Extensible (catch, fromException, try, bracket, throw,
 import Control.Applicative
 import Control.Monad.State
 import Control.Monad.Reader
+import Data.Default
 import System.FilePath
 import System.IO
 import System.Info
@@ -149,6 +150,9 @@ instance (Monoid a) => Monoid (X a) where
     mempty  = return mempty
     mappend = liftM2 mappend
 
+instance Default a => Default (X a) where
+    def = return def
+
 type ManageHook = Query (Endo WindowSet)
 newtype Query a = Query (ReaderT Window X a)
     deriving (Functor, Monad, MonadReader Window, MonadIO)
@@ -160,6 +164,9 @@ instance Monoid a => Monoid (Query a) where
     mempty  = return mempty
     mappend = liftM2 mappend
 
+instance Default a => Default (Query a) where
+    def = return def
+
 -- | Run the 'X' monad, given a chunk of 'X' monad code, and an initial state
 -- Return the result, and final state
 runX :: XConf -> XState -> X a -> IO (a, XState)