(text-mode-hook-identify): Function deleted.

(text-mode): Set text-mode-variant here.

lisp/textmodes/text-mode.el

@@ -65,6 +65,8 @@ You can thus get the full benefit of adaptive filling
  (see the variable `adaptive-fill-mode').
 \\{text-mode-map}
 Turning on Text mode runs the normal hook `text-mode-hook'."
+  (make-local-variable 'text-mode-variant)
+  (setq text-mode-variant t)
   (set (make-local-variable 'indent-line-function) 'indent-relative))
 
 (define-derived-mode paragraph-indent-text-mode text-mode "Parindent"
@@ -93,13 +95,6 @@ Turning on Paragraph-Indent minor mode runs the normal hook
       
 (defalias 'indented-text-mode 'text-mode)
 
-(defun text-mode-hook-identify ()
-  "Mark that this mode has run `text-mode-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,