From d3d9eb1e2ca9858e31a23f69847c45a17355c26f Mon Sep 17 00:00:00 2001
From: Kazu Yamamoto <kazu@iij.ad.jp>
Date: Thu, 27 Mar 2014 14:24:38 +0900
Subject: [PATCH] Data.ByteString cannot be loaded if not specified in cabal
 file.

---
 Language/Haskell/GhcMod/.ErrMsg.hs.swp | Bin 12288 -> 0 bytes
 elisp/ghc-comp.el                      |   6 +++---
 src/GHCMod.hs                          |   1 -
 3 files changed, 3 insertions(+), 4 deletions(-)
 delete mode 100644 Language/Haskell/GhcMod/.ErrMsg.hs.swp

diff --git a/Language/Haskell/GhcMod/.ErrMsg.hs.swp b/Language/Haskell/GhcMod/.ErrMsg.hs.swp
deleted file mode 100644
index 9ceabbc02decdd51cd75f6d57cccae51eb84e8b9..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 12288
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
a)BPjEG=LB7kw3|ON91U5a+138XV@QS5Opd5

diff --git a/elisp/ghc-comp.el b/elisp/ghc-comp.el
index 5b89f2b..ceb8268 100644
--- a/elisp/ghc-comp.el
+++ b/elisp/ghc-comp.el
@@ -30,6 +30,8 @@ unloaded modules are loaded")
 ;; must be sorted
 (defconst ghc-reserved-keyword '("case" "deriving" "do" "else" "if" "in" "let" "module" "of" "then" "where"))
 
+(defconst ghc-extra-keywords '("ByteString"))
+
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;;;
 ;;; Local Variables
@@ -73,7 +75,6 @@ unloaded modules are loaded")
 		 ghc-keyword-Control.Applicative
 		 ghc-keyword-Control.Monad
 		 ghc-keyword-Control.Exception
-		 ghc-keyword-Data.ByteString
 		 ghc-keyword-Data.Char
 		 ghc-keyword-Data.List
 		 ghc-keyword-Data.Maybe
@@ -87,7 +88,6 @@ unloaded modules are loaded")
 			"Control.Applicative"
 			"Control.Monad"
 			"Control.Exception"
-			"Data.ByteString"
 			"Data.Char"
 			"Data.List"
 			"Data.Maybe"
@@ -261,7 +261,7 @@ unloaded modules are loaded")
 (defun ghc-merge-keywords (mods)
   (setq ghc-loaded-module (append mods ghc-loaded-module))
   (let* ((modkeys (mapcar 'ghc-module-keyword ghc-loaded-module))
-	 (keywords (cons ghc-reserved-keyword modkeys))
+	 (keywords (cons ghc-extra-keywords (cons ghc-reserved-keyword modkeys)))
 	 (uniq-sorted (sort (ghc-uniq-lol keywords) 'string<)))
     (setq ghc-merged-keyword uniq-sorted)))
 
diff --git a/src/GHCMod.hs b/src/GHCMod.hs
index 0ce42e8..2e87cee 100644
--- a/src/GHCMod.hs
+++ b/src/GHCMod.hs
@@ -160,7 +160,6 @@ preBrowsedModules = [
   , "Control.Applicative"
   , "Control.Monad"
   , "Control.Exception"
-  , "Data.ByteString"
   , "Data.Char"
   , "Data.List"
   , "Data.Maybe"