From 766e697f3c619efc13ba4b3dc1b9ece21234ad2e Mon Sep 17 00:00:00 2001 From: Gracjan Polak Date: Thu, 26 Mar 2015 16:32:16 +0100 Subject: [PATCH] Properly set and kill vars in indent modes. --- haskell-indent.el | 1 + haskell-simple-indent.el | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/haskell-indent.el b/haskell-indent.el index 217aaa9c1..409079b54 100644 --- a/haskell-indent.el +++ b/haskell-indent.el @@ -1538,6 +1538,7 @@ One indentation cycle is used." (defun turn-off-haskell-indent () "Turn off ``intelligent'' Haskell indentation mode." (kill-local-variable 'indent-line-function) + (kill-local-variable 'indent-region-function) ;; Remove haskell-indent-map from the local map. (let ((map (current-local-map))) (while map diff --git a/haskell-simple-indent.el b/haskell-simple-indent.el index d2e65cd60..458417207 100644 --- a/haskell-simple-indent.el +++ b/haskell-simple-indent.el @@ -241,9 +241,10 @@ Runs `haskell-simple-indent-hook' on activation." :lighter " Ind" :group 'haskell-simple-indent :keymap '(([backtab] . haskell-simple-indent-backtab)) - (set (make-local-variable 'comment-indent-function) #'haskell-simple-indent-comment-indent-function) + (kill-local-variable 'comment-indent-function) (kill-local-variable 'indent-line-function) (when haskell-simple-indent-mode + (set (make-local-variable 'comment-indent-function) #'haskell-simple-indent-comment-indent-function) (set (make-local-variable 'indent-line-function) 'haskell-simple-indent) (run-hooks 'haskell-simple-indent-hook)))