From ad7a4e800d205f49ba87355c94871bbb5618e541 Mon Sep 17 00:00:00 2001 From: Ramakrishnan Muthukrishnan Date: Mon, 4 May 2015 11:44:31 +0530 Subject: [PATCH] haskell-mode changes --- init.el | 43 ++++++++++++++++++++----------------------- 1 file changed, 20 insertions(+), 23 deletions(-) diff --git a/init.el b/init.el index 2001876..19d312a 100644 --- a/init.el +++ b/init.el @@ -100,33 +100,30 @@ (add-hook 'haskell-mode-hook 'turn-on-haskell-indentation) ;; haskell mode +(require 'haskell-interactive-mode) +(require 'haskell-process) +(add-hook 'haskell-mode-hook 'interactive-haskell-mode) + (custom-set-variables '(haskell-process-suggest-remove-import-lines t) '(haskell-process-auto-import-loaded-modules t) '(haskell-process-log t)) -(eval-after-load 'haskell-mode '(progn - (define-key haskell-mode-map (kbd "C-c C-l") 'haskell-process-load-or-reload) - (define-key haskell-mode-map (kbd "C-c C-z") 'haskell-interactive-switch) - (define-key haskell-mode-map (kbd "C-c C-n C-t") 'haskell-process-do-type) - (define-key haskell-mode-map (kbd "C-c C-n C-i") 'haskell-process-do-info) - (define-key haskell-mode-map (kbd "C-c C-n C-c") 'haskell-process-cabal-build) - (define-key haskell-mode-map (kbd "C-c C-n c") 'haskell-process-cabal) - (define-key haskell-mode-map (kbd "SPC") 'haskell-mode-contextual-space))) -(eval-after-load 'haskell-cabal '(progn - (define-key haskell-cabal-mode-map (kbd "C-c C-z") 'haskell-interactive-switch) - (define-key haskell-cabal-mode-map (kbd "C-c C-k") 'haskell-interactive-mode-clear) - (define-key haskell-cabal-mode-map (kbd "C-c C-c") 'haskell-process-cabal-build) - (define-key haskell-cabal-mode-map (kbd "C-c c") 'haskell-process-cabal))) - -(eval-after-load 'haskell-mode - '(define-key haskell-mode-map (kbd "C-c C-o") 'haskell-compile)) -(eval-after-load 'haskell-cabal - '(define-key haskell-cabal-mode-map (kbd "C-c C-o") 'haskell-compile)) - -(eval-after-load 'haskell-mode - '(define-key haskell-mode-map [f8] 'haskell-navigate-imports)) - -(custom-set-variables '(haskell-process-type 'cabal-repl)) + +(eval-after-load "haskell-mode" + '(progn + (define-key haskell-mode-map (kbd "C-c C-l") 'haskell-process-load-or-reload) + (define-key haskell-mode-map (kbd "C-`") 'haskell-interactive-bring) + (define-key haskell-mode-map (kbd "C-c C-t") 'haskell-process-do-type) + (define-key haskell-mode-map (kbd "C-c C-i") 'haskell-process-do-info) + (define-key haskell-mode-map (kbd "C-c C-c") 'haskell-process-cabal-build) + (define-key haskell-mode-map (kbd "C-c C-k") 'haskell-interactive-mode-clear) + (define-key haskell-mode-map (kbd "C-c c") 'haskell-process-cabal) + (define-key haskell-mode-map (kbd "SPC") 'haskell-mode-contextual-space) + + (define-key haskell-cabal-mode-map (kbd "C-`") 'haskell-interactive-bring) + (define-key haskell-cabal-mode-map (kbd "C-c C-k") 'haskell-interactive-mode-clear) + (define-key haskell-cabal-mode-map (kbd "C-c C-c") 'haskell-process-cabal-build) + (define-key haskell-cabal-mode-map (kbd "C-c c") 'haskell-process-cabal))) ;; ghc-mod (autoload 'ghc-init "ghc" nil t) -- 2.37.2