# HG changeset patch
# User Erik Naggum <erik@naggum.no>
# Date 839990871 0
# Node ID 9f99285bb635180071428a5a313f70ca05e199c8
# Parent  c21d455f162f0d0b848144ad111d1a3612d46eef
(message-mode): Delete abbrev mode initialization.
(message-mode-hook): Move it here, instead, so the user can override it.

diff -r c21d455f162f -r 9f99285bb635 lisp/message.el
--- a/lisp/message.el	Wed Aug 14 02:09:54 1996 +0000
+++ b/lisp/message.el	Wed Aug 14 02:47:51 1996 +0000
@@ -260,7 +260,10 @@
 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 @@
   (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))