(message-mode): Delete abbrev mode initialization.

(message-mode-hook): Move it here, instead, so the user can override it.

diff --git a/lisp/message.el b/lisp/message.el
index 33920059a82e700eaabe53fdeebfe758e1a3a85c..30e6d698f7b340fd2022af70a71e9f5b7ff88ea3 100644 (file)
--- a/lisp/message.el
+++ b/lisp/message.el
@@ -260,7 +260,10 @@ The function `message-setup' runs this hook.")
 It is run after the headers have been inserted and before 
 the signature is inserted.")
 
-(defvar message-mode-hook nil
+(defvar message-mode-hook
+  (if (fboundp 'mail-abbrevs-setup)
+      '(mail-abbrevs-setup)
+    (list (intern "mail-aliases-setup")))
   "Hook run in message mode buffers.")
 
 (defvar message-header-hook nil
@@ -853,10 +856,6 @@ C-c C-r  message-ceasar-buffer-body (rot13 the message body)."
   (when (string-match "XEmacs\\|Lucid" emacs-version)
     (message-setup-toolbar))
   (easy-menu-add message-mode-menu message-mode-map)
-  ;; Allow mail alias things.
-  (if (fboundp 'mail-abbrevs-setup)
-      (mail-abbrevs-setup)
-    (funcall (intern "mail-aliases-setup")))
   (run-hooks 'text-mode-hook 'message-mode-hook))
 
 \f