From: Glenn Morris <rgm@gnu.org>
Date: Fri, 24 Apr 2015 18:49:12 +0000 (-0400)
Subject: * lisp/textmodes/text-mode.el (text-mode-hook):
X-Git-Tag: emacs-25.0.90~2312
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=18a78f8215cc0052bf41d23b8d594cde50d776dd;p=emacs.git

* lisp/textmodes/text-mode.el (text-mode-hook):
Move text-mode-hook-identify to default.
---

diff --git a/lisp/textmodes/text-mode.el b/lisp/textmodes/text-mode.el
index 84b578b5059..7effa6ade59 100644
--- a/lisp/textmodes/text-mode.el
+++ b/lisp/textmodes/text-mode.el
@@ -29,7 +29,9 @@
 
 ;;; Code:
 
-(defcustom text-mode-hook nil
+;; Normally non-nil defaults for hooks are bad, but since this file is
+;; preloaded it's ok/better, and avoids this showing up in customize-rogue.
+(defcustom text-mode-hook '(text-mode-hook-identify)
   "Normal hook run when entering Text mode and many related modes."
   :type 'hook
   :options '(turn-on-auto-fill turn-on-flyspell)
@@ -153,8 +155,6 @@ Turning on Paragraph-Indent minor mode runs the normal hook
 This is how `toggle-text-mode-auto-fill' knows which buffers to operate on."
   (set (make-local-variable 'text-mode-variant) t))
 
-(add-hook 'text-mode-hook 'text-mode-hook-identify)
-
 (defun toggle-text-mode-auto-fill ()
   "Toggle whether to use Auto Fill in Text mode and related modes.
 This command affects all buffers that use modes related to Text mode,