From: Erik Naggum <erik@naggum.no>
Date: Wed, 14 Aug 1996 02:47:51 +0000 (+0000)
Subject: (message-mode): Delete abbrev mode initialization.
X-Git-Tag: emacs-20.1~4079
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=a6392777ab99a58d8b3221c7a880ca770555b15a;p=emacs.git

(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 33920059a82..30e6d698f7b 100644
--- 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))