TakeV/spacemacs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

haskell: disable electric indent for cabal-mode

Browse source
This commit is contained in:
Benno Fünfstück 2017-02-02 13:11:57 +01:00 committed by Eivind Fonn
parent 5d613b63d2
commit 0d9c56cefc
2 changed files with 12 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
layers/+lang/haskell/funcs.el
View file

@ -81,6 +81,12 @@
(evil-define-key '(insert normal) intero-mode-map
(kbd "M-.") 'intero-goto-definition))
(defun spacemacs-haskell//disable-electric-indent ()
"Disable electric indent mode if available"
;; use only internal indentation system from haskell
(if (fboundp 'electric-indent-local-mode)
(electric-indent-local-mode -1)))
;; Intero functions

10
layers/+lang/haskell/packages.el
View file

@ -92,6 +92,11 @@
(add-hook 'haskell-cabal-mode-hook
'spacemacs//force-haskell-mode-loading)
;; Haskell cabal files interact badly with electric-indent-mode
;; note: we cannot add this hook in :config, since haskell-mode might
;; only be loaded after cabal-mode hooks are already run (see add-hook above)
(add-hook 'haskell-cabal-mode-hook #'spacemacs-haskell//disable-electric-indent)
(setq
;; Use notify.el (if you have it installed) at the end of running
;; Cabal commands or generally things worth notifying.
@ -106,11 +111,8 @@
haskell-stylish-on-save nil))
:config
(progn
;; Haskell main editing mode key bindings.
(defun spacemacs/init-haskell-mode ()
;; use only internal indentation system from haskell
(if (fboundp 'electric-indent-local-mode)
(electric-indent-local-mode -1)))
(spacemacs-haskell//disable-electric-indent))
(defun spacemacs/haskell-interactive-bring ()
"Bring up the interactive mode for this session without