* simple.el (mh-e-user-agent): Move to mh-e/mh-comp.el and autoload.

lisp/ChangeLog

+2005-12-28  Bill Wohler  <wohler@newt.com>
+
+	* simple.el (mh-e-user-agent): Move to mh-e/mh-comp.el and
+	autoload.
+
 2005-12-28  Stefan Monnier  <monnier@iro.umontreal.ca>
 	* vc.el (vc-annotate-display): Replace optional arg `color-map' with

lisp/mh-e/ChangeLog

+2005-12-28  Bill Wohler  <wohler@newt.com>
+
+	* mh-comp.el (mh-e-user-agent): Move here from simple.el. Use
+	mh-user-agent-compose instead of mh-smail-batch.
+
 2005-12-27  Bill Wohler  <wohler@newt.com>
 
 	* mh-utils.el (mh-prompt-for-folder): Use can-create argument to

lisp/mh-e/mh-comp.el

@@ -228,18 +228,28 @@ thus is suitable for use by programs that want to create a mail
 buffer. Users should use \\[mh-smail] to compose mail.
 
 Optional arguments for setting certain fields include TO,
-SUBJECT, and OTHER-HEADERS. Additional arguments are IGNORED."
+SUBJECT, and OTHER-HEADERS. Additional arguments are IGNORED.
+
+This function remains for Emacs 21 compatibility. New
+applications should use `mh-user-agent-compose'."
   (mh-find-path)
   (let ((mh-error-if-no-draft t))
     (mh-send (or to "") "" (or subject ""))))
 
-;; XEmacs needs this:
+;;;###autoload
+(define-mail-user-agent 'mh-e-user-agent
+  'mh-user-agent-compose 'mh-send-letter 'mh-fully-kill-draft
+  'mh-before-send-letter-hook)
+
 ;;;###autoload
 (defun mh-user-agent-compose (&optional to subject other-headers continue
                                         switch-function yank-action
                                         send-actions)
   "Set up mail composition draft with the MH mail system.
-This is `mail-user-agent' entry point to MH-E.
+This is the `mail-user-agent' entry point to MH-E. This function
+conforms to the contract specified by `define-mail-user-agent'
+which means that this function should accept the same arguments
+as `compose-mail'.
 
 The optional arguments TO and SUBJECT specify recipients and the
 initial Subject field, respectively.

lisp/simple.el

@@ -4569,10 +4569,6 @@ See also `read-mail-command' concerning reading mail."
 	(insert body))
       t)))
 
-(define-mail-user-agent 'mh-e-user-agent
-  'mh-smail-batch 'mh-send-letter 'mh-fully-kill-draft
-  'mh-before-send-letter-hook)
-
 (defun compose-mail (&optional to subject other-headers continue
 			       switch-function yank-action send-actions)
   "Start composing a mail message to send.