From: Ramakrishnan Muthukrishnan Date: Sun, 22 Nov 2015 01:25:41 +0000 (+0530) Subject: haskell-mode changes X-Git-Url: https://git.rkrishnan.org/?a=commitdiff_plain;h=33cae45c83245fdbceaa6fe174313722760f47db;p=.emacs.d.git haskell-mode changes --- diff --git a/init.el b/init.el index d36b5df..9442590 100644 --- a/init.el +++ b/init.el @@ -26,10 +26,6 @@ ;; If you edit it by hand, you could mess it up, so be careful. ;; Your init file should contain only one such instance. ;; If there is more than one, they won't work right. - '(haskell-process-auto-import-loaded-modules t) - '(haskell-process-log t) - '(haskell-process-suggest-remove-import-lines t) - '(haskell-process-type (quote cabal-repl)) '(initial-frame-alist (quote ((fullscreen . maximized)))) '(send-mail-function (quote smtpmail-send-it))) ;; Who use the bar to scroll? @@ -114,30 +110,27 @@ ;; (add-hook 'haskell-mode-hook 'haskell-indent-mode) ;; (add-hook 'haskell-mode-hook 'interactive-haskell-mode) ;(add-hook 'haskell-mode-hook 'turn-on-haskell-indent) -(add-hook 'haskell-mode-hook 'turn-on-haskell-indentation) +;(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) - - -(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))) +(custom-set-variables + '(haskell-process-suggest-remove-import-lines t) + '(haskell-process-auto-import-loaded-modules t) + '(haskell-process-log t) + '(haskell-process-type 'stack-ghci)) + +(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) ;; ghc-mod (autoload 'ghc-init "ghc" nil t) @@ -145,7 +138,6 @@ (setq ghc-debug t) (add-hook 'haskell-mode-hook (lambda () (ghc-init))) - ;; ido (setq ido-enable-flex-matching t) (setq ido-everywhere t)