From d5c1edc297b12defb9ac858624ef9c6e23e82ca8 Mon Sep 17 00:00:00 2001
From: Bozhidar Batsov <bozhidar@tradeo.com>
Date: Fri, 5 Oct 2012 19:35:39 +0300
Subject: [PATCH] turns out using a mode in a hook always enables it so the
 turn on functions were not actually needed

---
 prelude/prelude-core.el   | 17 -----------------
 prelude/prelude-editor.el | 14 +++-----------
 2 files changed, 3 insertions(+), 28 deletions(-)

diff --git a/prelude/prelude-core.el b/prelude/prelude-core.el
index d2bbf5b..08aa72e 100644
--- a/prelude/prelude-core.el
+++ b/prelude/prelude-core.el
@@ -231,23 +231,6 @@ there's a region, all lines that region covers will be duplicated."
     (cond ((search-forward "<?xml" nil t) (xml-mode))
           ((search-forward "<html" nil t) (html-mode)))))
 
-;; We have a number of turn-on-* functions since it's advised that lambda
-;; functions not go in hooks. Repeatedly evaluating an add-to-list with a
-;; hook value will repeatedly add it since there's no way to ensure
-;; that a lambda doesn't already exist in the list.
-
-(defun prelude-turn-on-whitespace ()
-  (whitespace-mode +1))
-
-(defun prelude-turn-off-whitespace ()
-  (whitespace-mode -1))
-
-(defun prelude-turn-on-abbrev ()
-  (abbrev-mode +1))
-
-(defun prelude-turn-off-abbrev ()
-  (abbrev-mode -1))
-
 (defun prelude-untabify-buffer ()
   (interactive)
   (untabify (point-min) (point-max)))
diff --git a/prelude/prelude-editor.el b/prelude/prelude-editor.el
index cb162c2..8beccd8 100644
--- a/prelude/prelude-editor.el
+++ b/prelude/prelude-editor.el
@@ -168,13 +168,8 @@
       ispell-extra-args '("--sug-mode=ultra"))
 (autoload 'flyspell-mode "flyspell" "On-the-fly spelling checker." t)
 
-(defun prelude-turn-on-flyspell ()
-  "Force flyspell-mode on using a positive argument.  For use in hooks."
-  (interactive)
-  (flyspell-mode +1))
-
-(add-hook 'message-mode-hook 'prelude-turn-on-flyspell)
-(add-hook 'text-mode-hook 'prelude-turn-on-flyspell)
+(add-hook 'message-mode-hook 'flyspell-mode)
+(add-hook 'text-mode-hook 'flyspell-mode)
 
 ;; enable narrowing commands
 (put 'narrow-to-region 'disabled nil)
@@ -191,9 +186,6 @@
 (setq bookmark-default-file (concat prelude-savefile-dir "bookmarks")
       bookmark-save-flag 1)
 
-;; enabled auto-fill mode in text-mode and all related modes
-(add-hook 'text-mode-hook 'turn-on-auto-fill)
-
 ;; load yasnippet
 (require 'yasnippet)
 (add-to-list 'yas/snippet-dirs prelude-snippets-dir)
@@ -267,7 +259,7 @@ indent yanked text (with prefix arg don't indent)."
     (yank-advised-indent-function (region-beginning) (region-end)))))
 
 ;; abbrev config
-(add-hook 'text-mode-hook 'prelude-turn-on-abbrev)
+(add-hook 'text-mode-hook 'abbrev-mode)
 
 ;; make a shell script executable automatically on save
 (add-hook 'after-save-hook