From 1a40ad1edeafa4401b54a0035c128c994cc9137b Mon Sep 17 00:00:00 2001
From: Mark Lentczner <markl@glyphic.com>
Date: Fri, 23 Jul 2010 17:44:29 +0000
Subject: rename --default-themes to --built-in-themes

---
 src/Haddock/Backends/Xhtml/Themes.hs | 2 +-
 src/Haddock/Options.hs               | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/Haddock/Backends/Xhtml/Themes.hs b/src/Haddock/Backends/Xhtml/Themes.hs
index 35a3986b..43339791 100644
--- a/src/Haddock/Backends/Xhtml/Themes.hs
+++ b/src/Haddock/Backends/Xhtml/Themes.hs
@@ -93,7 +93,7 @@ getThemes libDir flags =
   where
     themeFlag :: Flag -> IO (Either String Themes)
     themeFlag (Flag_CSS path) = (liftM . liftEither) (:[]) (theme path)
-    themeFlag (Flag_DefaultThemes) = retRight builtIns
+    themeFlag (Flag_BuiltInThemes) = retRight builtIns
     themeFlag _ = retRight []
 
     theme :: FilePath -> IO PossibleTheme
diff --git a/src/Haddock/Options.hs b/src/Haddock/Options.hs
index 0e2e244b..f8bec718 100644
--- a/src/Haddock/Options.hs
+++ b/src/Haddock/Options.hs
@@ -38,11 +38,11 @@ import System.Console.GetOpt
 
 
 data Flag
-  = Flag_CSS String
+  = Flag_BuiltInThemes
+  | Flag_CSS String
   | Flag_Debug
 --  | Flag_DocBook
   | Flag_ReadInterface String
-  | Flag_DefaultThemes
   | Flag_DumpInterface String
   | Flag_Heading String
   | Flag_Html
@@ -114,7 +114,7 @@ options backwardsCompat =
       "URL for a comments link for each entity\n(using the %{FILE}, %{MODULE}, %{NAME},\n%{KIND} or %{LINE} vars)",
     Option ['c']  ["css", "theme"] (ReqArg Flag_CSS "PATH")
       "the CSS file or theme directory to use for HTML output",
-    Option []  ["default-themes"] (NoArg Flag_DefaultThemes)
+    Option []  ["built-in-themes"] (NoArg Flag_BuiltInThemes)
       "include all the built-in haddock themes",
     Option ['p']  ["prologue"] (ReqArg Flag_Prologue "FILE")
       "file containing prologue text",
-- 
cgit v1.2.3