From 21bdffc82de962541e663ef01a851bea95dd2d6c Mon Sep 17 00:00:00 2001
From: Shachaf Ben-Kiki <shachaf@gmail.com>
Date: Mon, 8 Oct 2007 04:21:41 +0200
Subject: Add LANGUAGE pragams

It seems that GHC 6.6 just enables -fglasgow-exts when it sees any LANGUAGE
pragma, so not all of them were added; this patch adds the rest of them, which
is necessary for xmonad to compile in GHC >

darcs-hash:20071008022141-bffde-c7ab0ae3d58eab8707b5f428a7236540bae5b4e1.gz
---
 Accordion.hs          | 2 +-
 Circle.hs             | 3 ++-
 Combo.hs              | 3 +--
 Dishes.hs             | 2 +-
 DragPane.hs           | 3 ++-
 FlexibleManipulate.hs | 3 ++-
 Grid.hs               | 2 +-
 LayoutHints.hs        | 2 +-
 LayoutModifier.hs     | 3 ++-
 LayoutScreens.hs      | 2 +-
 MagicFocus.hs         | 2 +-
 Magnifier.hs          | 1 +
 Maximize.hs           | 3 ++-
 Mosaic.hs             | 1 +
 MosaicAlt.hs          | 2 +-
 NoBorders.hs          | 2 +-
 ResizableTile.hs      | 2 +-
 Roledex.hs            | 2 +-
 Spiral.hs             | 2 +-
 Square.hs             | 3 ++-
 SwitchTrans.hs        | 1 +
 Tabbed.hs             | 3 ++-
 ThreeColumns.hs       | 2 +-
 TwoPane.hs            | 2 +-
 WindowNavigation.hs   | 2 +-
 WorkspaceDir.hs       | 3 ++-
 26 files changed, 34 insertions(+), 24 deletions(-)

diff --git a/Accordion.hs b/Accordion.hs
index b2fbec8..1edec42 100644
--- a/Accordion.hs
+++ b/Accordion.hs
@@ -1,4 +1,4 @@
-{-# LANGUAGE FlexibleInstances #-}
+{-# LANGUAGE FlexibleInstances, MultiParamTypeClasses, TypeSynonymInstances #-}
 
 -----------------------------------------------------------------------------
 -- |
diff --git a/Circle.hs b/Circle.hs
index a60cdf9..6fa9860 100644
--- a/Circle.hs
+++ b/Circle.hs
@@ -1,4 +1,5 @@
-{-# LANGUAGE FlexibleInstances #-}
+{-# LANGUAGE FlexibleInstances, MultiParamTypeClasses, TypeSynonymInstances #-}
+
 -----------------------------------------------------------------------------
 -- |
 -- Module      :  XMonadContrib.Circle
diff --git a/Combo.hs b/Combo.hs
index f4ab4b0..99dba29 100644
--- a/Combo.hs
+++ b/Combo.hs
@@ -1,5 +1,4 @@
-{-# OPTIONS_GHC -fallow-undecidable-instances #-}
-{-# LANGUAGE FlexibleInstances #-}
+{-# LANGUAGE FlexibleInstances, MultiParamTypeClasses, UndecidableInstances #-}
 
 -----------------------------------------------------------------------------
 -- |
diff --git a/Dishes.hs b/Dishes.hs
index e080d71..8faff4e 100644
--- a/Dishes.hs
+++ b/Dishes.hs
@@ -1,4 +1,4 @@
-{-# LANGUAGE FlexibleInstances #-}
+{-# OPTIONS_GHC -fglasgow-exts #-}
 -----------------------------------------------------------------------------
 -- |
 -- Module      :  XMonadContrib.Dishes
diff --git a/DragPane.hs b/DragPane.hs
index fa73c0b..0546cb0 100644
--- a/DragPane.hs
+++ b/DragPane.hs
@@ -1,4 +1,5 @@
-{-# LANGUAGE FlexibleInstances #-}
+{-# OPTIONS_GHC -fglasgow-exts #-} -- For deriving Data/Typeable
+{-# LANGUAGE FlexibleInstances, MultiParamTypeClasses, PatternGuards, TypeSynonymInstances #-}
 
 -----------------------------------------------------------------------------
 -- |
diff --git a/FlexibleManipulate.hs b/FlexibleManipulate.hs
index 778859c..c85706a 100644
--- a/FlexibleManipulate.hs
+++ b/FlexibleManipulate.hs
@@ -1,4 +1,5 @@
-{-# LANGUAGE FlexibleInstances #-}
+{-# LANGUAGE FlexibleInstances, TypeSynonymInstances #-}
+
 -----------------------------------------------------------------------------
 -- |
 -- Module      :  XMonadContrib.FlexibleManipulate
diff --git a/Grid.hs b/Grid.hs
index 361b566..b7fe41b 100644
--- a/Grid.hs
+++ b/Grid.hs
@@ -1,4 +1,4 @@
-{-# LANGUAGE FlexibleInstances #-}
+{-# OPTIONS_GHC -fglasgow-exts #-}
 -----------------------------------------------------------------------------
 -- |
 -- Module      :  XMonadContrib.Grid
diff --git a/LayoutHints.hs b/LayoutHints.hs
index 67816e2..e804102 100644
--- a/LayoutHints.hs
+++ b/LayoutHints.hs
@@ -1,4 +1,4 @@
-{-# LANGUAGE FlexibleInstances #-}
+{-# LANGUAGE FlexibleInstances, MultiParamTypeClasses, TypeSynonymInstances #-}
 
 -----------------------------------------------------------------------------
 -- |
diff --git a/LayoutModifier.hs b/LayoutModifier.hs
index 59258f9..1bf276f 100644
--- a/LayoutModifier.hs
+++ b/LayoutModifier.hs
@@ -1,4 +1,5 @@
-{-# LANGUAGE MultiParamTypeClasses #-}
+{-# -fglasgow-exts #-} -- For deriving Data/Typeable
+{-# LANGUAGE FlexibleInstances, MultiParamTypeClasses, PatternGuards #-}
 
 -----------------------------------------------------------------------------
 -- |
diff --git a/LayoutScreens.hs b/LayoutScreens.hs
index 06947d2..85dad37 100644
--- a/LayoutScreens.hs
+++ b/LayoutScreens.hs
@@ -1,4 +1,4 @@
-{-# LANGUAGE FlexibleInstances #-}
+{-# LANGUAGE FlexibleContexts, FlexibleInstances, MultiParamTypeClasses #-}
 
 -----------------------------------------------------------------------------
 -- |
diff --git a/MagicFocus.hs b/MagicFocus.hs
index 8da3439..4154049 100644
--- a/MagicFocus.hs
+++ b/MagicFocus.hs
@@ -1,4 +1,4 @@
-{-# LANGUAGE FlexibleInstances #-}
+{-# LANGUAGE FlexibleContexts, FlexibleInstances, MultiParamTypeClasses, TypeSynonymInstances #-}
 
 -----------------------------------------------------------------------------
 -- |
diff --git a/Magnifier.hs b/Magnifier.hs
index 6bd8306..49ea131 100644
--- a/Magnifier.hs
+++ b/Magnifier.hs
@@ -1,4 +1,5 @@
 {-# OPTIONS_GHC -fglasgow-exts #-}
+
 -----------------------------------------------------------------------------
 -- |
 -- Module      :  XMonadContrib.Magnifier
diff --git a/Maximize.hs b/Maximize.hs
index 2322c54..db9d265 100644
--- a/Maximize.hs
+++ b/Maximize.hs
@@ -1,4 +1,5 @@
-{-# LANGUAGE FlexibleInstances #-}
+{-# OPTIONS_GHC -fglasgow-exts #-} -- For deriving Data/Typeable
+{-# LANGUAGE FlexibleContexts, FlexibleInstances, MultiParamTypeClasses, TypeSynonymInstances #-}
 
 -----------------------------------------------------------------------------
 -- |
diff --git a/Mosaic.hs b/Mosaic.hs
index 5fa3304..fe99444 100644
--- a/Mosaic.hs
+++ b/Mosaic.hs
@@ -1,4 +1,5 @@
 {-# OPTIONS -fglasgow-exts #-}
+
 -----------------------------------------------------------------------------
 -- |
 -- Module      :  XMonadContrib.Mosaic
diff --git a/MosaicAlt.hs b/MosaicAlt.hs
index 14a1828..a5308e3 100644
--- a/MosaicAlt.hs
+++ b/MosaicAlt.hs
@@ -1,4 +1,4 @@
-{-# LANGUAGE GeneralizedNewtypeDeriving #-}
+{-# OPTIONS -fglasgow-exts #-}
 -----------------------------------------------------------------------------
 -- |
 -- Module      :  XMonadContrib.MosaicAlt
diff --git a/NoBorders.hs b/NoBorders.hs
index 30944c3..16bd534 100644
--- a/NoBorders.hs
+++ b/NoBorders.hs
@@ -1,4 +1,4 @@
-{-# LANGUAGE FlexibleInstances #-}
+{-# LANGUAGE FlexibleContexts, FlexibleInstances, MultiParamTypeClasses, TypeSynonymInstances #-}
 
 -----------------------------------------------------------------------------
 -- |
diff --git a/ResizableTile.hs b/ResizableTile.hs
index 650e3fa..f4617d2 100644
--- a/ResizableTile.hs
+++ b/ResizableTile.hs
@@ -1,4 +1,4 @@
-{-# LANGUAGE GeneralizedNewtypeDeriving, FlexibleInstances #-}
+{-# OPTIONS_GHC -fglasgow-exts #-}
 -----------------------------------------------------------------------------
 -- |
 -- Module      :  XMonadContrib.ResizableTile
diff --git a/Roledex.hs b/Roledex.hs
index c7b407b..8765146 100644
--- a/Roledex.hs
+++ b/Roledex.hs
@@ -1,4 +1,4 @@
-{-# LANGUAGE FlexibleInstances #-}
+{-# LANGUAGE FlexibleInstances, TypeSynonymInstances, MultiParamTypeClasses #-}
 
 -----------------------------------------------------------------------------
 -- |
diff --git a/Spiral.hs b/Spiral.hs
index 42e7881..53b4d45 100644
--- a/Spiral.hs
+++ b/Spiral.hs
@@ -1,4 +1,4 @@
-{-# LANGUAGE MultiParamTypeClasses #-}
+{-# LANGUAGE FlexibleInstances, MultiParamTypeClasses #-}
 
 -----------------------------------------------------------------------------
 -- |
diff --git a/Square.hs b/Square.hs
index 48b9427..42de974 100644
--- a/Square.hs
+++ b/Square.hs
@@ -1,4 +1,5 @@
-{-# LANGUAGE MultiParamTypeClasses #-}
+{-# LANGUAGE FlexibleInstances, MultiParamTypeClasses #-}
+
 -----------------------------------------------------------------------------
 -- |
 -- Module      :  XMonadContrib.Square
diff --git a/SwitchTrans.hs b/SwitchTrans.hs
index c4be6cd..5683436 100644
--- a/SwitchTrans.hs
+++ b/SwitchTrans.hs
@@ -1,4 +1,5 @@
 {-# OPTIONS_GHC -fglasgow-exts #-}
+
 -----------------------------------------------------------------------------
 -- |
 -- Module      :  XMonadContrib.SwitchTrans
diff --git a/Tabbed.hs b/Tabbed.hs
index 6f1cdf6..0996e06 100644
--- a/Tabbed.hs
+++ b/Tabbed.hs
@@ -1,4 +1,5 @@
-{-# LANGUAGE FlexibleInstances #-}
+{-# LANGUAGE FlexibleInstances, MultiParamTypeClasses, PatternGuards, TypeSynonymInstances #-}
+
 -----------------------------------------------------------------------------
 -- |
 -- Module      :  XMonadContrib.Tabbed
diff --git a/ThreeColumns.hs b/ThreeColumns.hs
index 683af88..1475586 100644
--- a/ThreeColumns.hs
+++ b/ThreeColumns.hs
@@ -1,4 +1,4 @@
-{-# LANGUAGE FlexibleInstances #-}
+{-# LANGUAGE FlexibleInstances, MultiParamTypeClasses #-}
 
 -----------------------------------------------------------------------------
 -- |
diff --git a/TwoPane.hs b/TwoPane.hs
index 867e6a7..a3ea118 100644
--- a/TwoPane.hs
+++ b/TwoPane.hs
@@ -1,4 +1,4 @@
-{-# LANGUAGE FlexibleInstances #-}
+{-# LANGUAGE FlexibleInstances, MultiParamTypeClasses #-}
 
 -----------------------------------------------------------------------------
 -- |
diff --git a/WindowNavigation.hs b/WindowNavigation.hs
index a219a54..5410a15 100644
--- a/WindowNavigation.hs
+++ b/WindowNavigation.hs
@@ -1,4 +1,4 @@
-{-# LANGUAGE GeneralizedNewtypeDeriving, FlexibleInstances #-}
+{-# OPTIONS -fglasgow-exts #-}
 -----------------------------------------------------------------------------
 -- |
 -- Module      :  XMonadContrib.WorkspaceDir
diff --git a/WorkspaceDir.hs b/WorkspaceDir.hs
index 97e5f94..3fe46d5 100644
--- a/WorkspaceDir.hs
+++ b/WorkspaceDir.hs
@@ -1,4 +1,5 @@
-{-# LANGUAGE FlexibleInstances #-}
+{-# OPTIONS_GHC -fglasgow-exts #-} -- For deriving Data/Typeable
+{-# LANGUAGE FlexibleInstances, MultiParamTypeClasses #-}
 
 -----------------------------------------------------------------------------
 -- |
-- 
cgit v1.2.3