--- a/haskell-init.el	Mon Oct 15 20:31:39 2012 -0500
+++ b/haskell-init.el	Sat Jun 22 22:54:53 2013 -0500
@@ -1,8 +1,14 @@
 ;; ~/.emacs.d/haskell-init.el
 ;; Luke Hoersten <[email protected]>
 
-(add-to-list 'load-path "~/.emacs.d/thirdparty/haskell-mode") ; override haskell mode on system
-(load "haskell-site-file")
+(add-to-list 'load-path "~/.emacs.d/thirdparty/haskell-mode/")
+(require 'haskell-mode-autoloads)
+
+;; (add-to-list 'load-path "~/.emacs.d/thirdparty/haskell-mode") ; override haskell mode on system
+;;(add-to-list 'load-path "~/.cabal/share/ghc-mod-2.0.2") ; load ghc-mod from cabal
+;; (autoload 'ghc-init "~/.emacs.d/thirdparty/ghc-mod-2.0.2/ghc" nil t)
+
+;; (load "haskell-site-file")
 
 ;; ;; scion
 ;; (if (file-exists-p "~/.cabal/share/scion-0.3/emacs/scion.el")
@@ -20,12 +26,12 @@
 (add-hook
  'haskell-mode-hook
  (lambda ()
+   ;; (ghc-init)
    (turn-on-haskell-indent)
    (capitalized-words-mode)
    (turn-on-haskell-doc-mode)
    (turn-on-haskell-decl-scan)
    (imenu-add-menubar-index)
-   (local-set-key (kbd "C-x C-s") 'haskell-mode-save-buffer)
    (setq
     haskell-font-lock-haddock t
     haskell-stylish-on-save t