Sync up with Emacs-21_0_105+LEIM.

diff --git a/mail/feedmail.el b/mail/feedmail.el
index dcff42b..f02c2f1 100644 (file)
--- a/mail/feedmail.el
+++ b/mail/feedmail.el
@@ -1,6 +1,8 @@
 ;;; feedmail.el --- assist other email packages to massage outgoing messages
 ;;; This file is in the public domain.
 
 ;;; feedmail.el --- assist other email packages to massage outgoing messages
 ;;; This file is in the public domain.
 

+;; This file is part of GNU Emacs.
+

 ;; Author: Bill Carpenter <bill@bubblegum.net>, <bill@carpenter.ORG>
 ;; Version: 8
 ;; Keywords: email, queue, mail, sendmail, message, spray, smtp, draft
 ;; Author: Bill Carpenter <bill@bubblegum.net>, <bill@carpenter.ORG>
 ;; Version: 8
 ;; Keywords: email, queue, mail, sendmail, message, spray, smtp, draft

@@ -2675,4 +2677,5 @@ been weeded out."
       (point-marker))))
 
 (provide 'feedmail)
       (point-marker))))
 
 (provide 'feedmail)

+

 ;;; feedmail.el ends here
 ;;; feedmail.el ends here

diff --git a/mail/smtpmail.el b/mail/smtpmail.el
index 91077b8..6a6bd59 100644 (file)
--- a/mail/smtpmail.el
+++ b/mail/smtpmail.el
@@ -28,7 +28,8 @@
 
 ;; Please add these lines in your .emacs(_emacs).
 ;;
 
 ;; Please add these lines in your .emacs(_emacs).
 ;;

-;;(setq send-mail-function 'smtpmail-send-it)
+;;(setq send-mail-function 'smtpmail-send-it) ; if you use `mail'
+;;(setq message-send-mail-function 'smtpmail-send-it) ; if you are using Gnus.

 ;;(setq smtp-default-server "YOUR SMTP HOST")
 ;;(setq smtp-service "smtp")
 ;;(setq smtp-local-domain "YOUR DOMAIN NAME")
 ;;(setq smtp-default-server "YOUR SMTP HOST")
 ;;(setq smtp-service "smtp")
 ;;(setq smtp-local-domain "YOUR DOMAIN NAME")