hasufell/ghc-mod
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'stable' into release

Browse Source 
Conflicts:
	ChangeLog
	ghc-mod.cabal
	test/CheckSpec.hs
This commit is contained in:
Daniel Gröber 2014-09-12 06:43:49 +02:00
commit ed02a383c0
2 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ChangeLog
View File

@ -5,8 +5,6 @@ UNRELEASED v5.1.0.0
the ErrorT part of GhcModT on `liftIO`. the ErrorT part of GhcModT on `liftIO`.
* Make `loadSymbolDb` polimorphic in the return types's monad. * Make `loadSymbolDb` polimorphic in the return types's monad.
* Add `hoistGhcModT` to Language.Haskell.GhcMod.Internal * Add `hoistGhcModT` to Language.Haskell.GhcMod.Internal
UNRELEASED v5.0.1.3
* Fix `check` command for modules using `-XPatternSynonyms` * Fix `check` command for modules using `-XPatternSynonyms`
* Merge #364, Support cabal configuration flags * Merge #364, Support cabal configuration flags

2
elisp/ghc.el
View File

@ -28,7 +28,7 @@
(< emacs-minor-version minor))) (< emacs-minor-version minor)))
(error "ghc-mod requires at least Emacs %d.%d" major minor))) (error "ghc-mod requires at least Emacs %d.%d" major minor)))
(defconst ghc-version "5.0.0") (defconst ghc-version "5.1.0.0")
;; (eval-when-compile ;; (eval-when-compile
;; (require 'haskell-mode)) ;; (require 'haskell-mode))