GNU Emacs 21.2 with LEIM.

[elisp/lemi.git] / mail / feedmail.el

diff --git a/mail/feedmail.el b/mail/feedmail.el
index f5d8150..7db3215 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.
 
+;; 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
@@ -306,6 +308,7 @@
 (defgroup feedmail nil
   "Assist other email packages to massage outgoing messages."
   :link '(url-link "http://www.carpenter.org/feedmail/feedmail.html")
+  :link '(emacs-commentary-link "feedmail")
   :group 'mail)
 
 (defgroup feedmail-misc nil
@@ -1432,12 +1435,9 @@ insertion.")
 
 ;;;###autoload
 (defun feedmail-send-it ()
-  "A function which is a suitable value for `send-mail-function'.
-To use it, you probably want something like this in your .emacs or
-similar place:
-
-  (setq send-mail-function 'feedmail-send-it)
-  (autoload 'feedmail-send-it \"feedmail\")"
+  "Send the current mail buffer using the Feedmail package.
+This is a suitable value for `send-mail-function'.  It can be used
+with various lower-level mechanisms to provide features such as queueing."
 
   ;; avoid matching trouble over slash vs backslash by getting canonical
   (if feedmail-queue-directory
@@ -1770,7 +1770,7 @@ you can set feedmail-queue-reminder-alist to nil."
 
 (defun feedmail-queue-send-edit-prompt-help (d-string)
   (let ((fqm-help (get-buffer feedmail-p-h-b-n)))
-    (if (and fqm-help (get-buffer-window fqm-help))
+    (if (and fqm-help (get-buffer-window fqm-help 'visible))
        (feedmail-queue-send-edit-prompt-help-later fqm-help d-string)
       (feedmail-queue-send-edit-prompt-help-first d-string))))
 
@@ -2669,4 +2669,5 @@ been weeded out."
       (point-marker))))
 
 (provide 'feedmail)
+
 ;;; feedmail.el ends here