From 28f57f7e00dcf6ce1ab60f6389ab078719fe5fd3 Mon Sep 17 00:00:00 2001
From: Chong Yidong <cyd@stupidchicken.com>
Date: Tue, 1 Dec 2009 16:20:59 +0000
Subject: [PATCH] * mail/sendmail.el (mail-setup-hook, mail-send-hook): Doc
 fixes.

* gnus/message.el (message-setup-hook, message-send-hook): Make into aliases
for mail-*-hook.
---
 lisp/ChangeLog        |  4 ++++
 lisp/gnus/ChangeLog   |  5 +++++
 lisp/gnus/message.el  | 30 +++++++++++++++++-------------
 lisp/mail/sendmail.el |  5 ++---
 4 files changed, 28 insertions(+), 16 deletions(-)

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 81833622c71..7b6d96a142d 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2009-12-01  Chong Yidong  <cyd@stupidchicken.com>
+
+	* mail/sendmail.el (mail-setup-hook, mail-send-hook): Doc fixes.
+
 2009-12-01  Glenn Morris  <rgm@gnu.org>
 
 	* Makefile.in (ELCFILES): Add mpc.elc.
diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index ff3d7e3ce13..2c21288e395 100644
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,3 +1,8 @@
+2009-12-01  Chong Yidong  <cyd@stupidchicken.com>
+
+	* message.el (message-setup-hook, message-send-hook): Make into aliases
+	for mail-*-hook.
+
 2009-11-29  Juri Linkov  <juri@jurta.org>
 
 	* gnus-sum.el (gnus-recenter): Use `recenter-top-bottom'
diff --git a/lisp/gnus/message.el b/lisp/gnus/message.el
index 3f529047d29..7993aff87cd 100644
--- a/lisp/gnus/message.el
+++ b/lisp/gnus/message.el
@@ -918,12 +918,14 @@ auto-fill in message buffers."
   :type '(choice (const :tag "Don't turn on auto fill" nil)
 		 (integer)))
 
-(defcustom message-setup-hook nil
-  "Normal hook, run each time a new outgoing message is initialized.
-The function `message-setup' runs this hook."
-  :group 'message-various
-  :link '(custom-manual "(message)Various Message Variables")
-  :type 'hook)
+;; (defcustom message-setup-hook nil
+;;   "Normal hook, run each time a new outgoing message is initialized.
+;; The function `message-setup' runs this hook."
+;;   :group 'message-various
+;;   :link '(custom-manual "(message)Various Message Variables")
+;;   :type 'hook)
+
+(defvaralias 'message-setup-hook 'mail-setup-hook)
 
 (defcustom message-cancel-hook nil
   "Hook run when cancelling articles."
@@ -1565,13 +1567,15 @@ starting with `not' and followed by regexps."
   "Alist of mail and news faces for facemenu.
 The cdr of each entry is a function for applying the face to a region.")
 
-(defcustom message-send-hook nil
-  "Hook run before sending messages.
-This hook is run quite early when sending."
-  :group 'message-various
-  :options '(ispell-message)
-  :link '(custom-manual "(message)Various Message Variables")
-  :type 'hook)
+;; (defcustom message-send-hook nil
+;;   "Hook run before sending messages.
+;; This hook is run quite early when sending."
+;;   :group 'message-various
+;;   :options '(ispell-message)
+;;   :link '(custom-manual "(message)Various Message Variables")
+;;   :type 'hook)
+
+(defvaralias 'message-send-hook 'mail-send-hook)
 
 (defcustom message-send-mail-hook nil
   "Hook run before sending mail messages.
diff --git a/lisp/mail/sendmail.el b/lisp/mail/sendmail.el
index 59cd70aa578..beba6be12fe 100644
--- a/lisp/mail/sendmail.el
+++ b/lisp/mail/sendmail.el
@@ -221,8 +221,7 @@ This file need not actually exist."
 
 ;;;###autoload
 (defcustom mail-setup-hook nil
-  "Normal hook, run each time a new outgoing mail message is initialized.
-The function `mail-setup' runs this hook."
+  "Normal hook, run each time a new outgoing message is initialized."
   :type 'hook
   :options '(fortune-to-signature spook mail-abbrevs-setup)
   :group 'sendmail)
@@ -816,7 +815,7 @@ Prefix arg means don't delete this window."
 	  (switch-to-buffer newbuf))))))
 
 (defcustom mail-send-hook nil
-  "Hook run just before sending mail with `mail-send'."
+  "Hook run just before sending a message."
   :type 'hook
   :options '(flyspell-mode-off)
   :group 'sendmail)
-- 
2.39.5