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

haskell: fix haskell-indentation eval-after-load

Browse source 
The `progn` in the eval-after-load was not quoted, so it was being
evaluated unconditionally. This led to the haskell-indentation guides
being unconditionally enabled.

Additionally, only enable the indentation guides when
haskell-indentation-mode is on.

Resolves #1136.
This commit is contained in:
Chris Barrett 2015-05-05 09:17:02 +12:00 committed by syl20bnr
parent 0e2662dc3c
commit e1d2cbd1c4
1 changed files with 16 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
contrib/lang/haskell/packages.el
View file

@ -162,25 +162,25 @@
[?\C-c ?\C-z] 'haskell-interactive-switch))))
(eval-after-load 'haskell-indentation
(progn
;; Show indentation guides in insert or emacs state only.
(defun spacemacs//haskell-indentation-show-guides ()
"Show visual indentation guides."
(when (derived-mode-p 'haskell-mode)
(haskell-indentation-enable-show-indentations)))
'(progn
;; Show indentation guides in insert or emacs state only.
(defun spacemacs//haskell-indentation-show-guides ()
"Show visual indentation guides."
(when (and (boundp 'haskell-indentation-mode) haskell-indentation-mode)
(haskell-indentation-enable-show-indentations)))
(defun spacemacs//haskell-indentation-hide-guides ()
"Hide visual indentation guides."
(when (derived-mode-p 'haskell-mode)
(haskell-indentation-disable-show-indentations)))
(defun spacemacs//haskell-indentation-hide-guides ()
"Hide visual indentation guides."
(when (and (boundp 'haskell-indentation-mode) haskell-indentation-mode)
(haskell-indentation-disable-show-indentations)))
;; first entry in normal state
(add-hook 'evil-normal-state-entry-hook 'spacemacs//haskell-indentation-hide-guides)
;; first entry in normal state
(add-hook 'evil-normal-state-entry-hook 'spacemacs//haskell-indentation-hide-guides)
(add-hook 'evil-insert-state-entry-hook 'spacemacs//haskell-indentation-show-guides)
(add-hook 'evil-emacs-state-entry-hook 'spacemacs//haskell-indentation-show-guides)
(add-hook 'evil-insert-state-exit-hook 'spacemacs//haskell-indentation-hide-guides)
(add-hook 'evil-emacs-state-exit-hook 'spacemacs//haskell-indentation-hide-guides))))
(add-hook 'evil-insert-state-entry-hook 'spacemacs//haskell-indentation-show-guides)
(add-hook 'evil-emacs-state-entry-hook 'spacemacs//haskell-indentation-show-guides)
(add-hook 'evil-insert-state-exit-hook 'spacemacs//haskell-indentation-hide-guides)
(add-hook 'evil-emacs-state-exit-hook 'spacemacs//haskell-indentation-hide-guides))))
(defun haskell/init-haskell-snippets ()
;; manually load the package since the current implementation is not lazy