Importing qgnus-0.20

[elisp/gnus.git-] / lisp / gnus-draft.el

diff --git a/lisp/gnus-draft.el b/lisp/gnus-draft.el
index 31ad3f5..e7cd8a2 100644 (file)
--- a/lisp/gnus-draft.el
+++ b/lisp/gnus-draft.el
@@ -87,22 +87,20 @@
 (defun gnus-draft-edit-message ()
   "Enter a mail/post buffer to edit and send the draft."
   (interactive)
-  (gnus-set-global-variables)
   (let ((article (gnus-summary-article-number)))
+    (gnus-summary-mark-as-read article gnus-canceled-mark)
     (gnus-draft-setup article gnus-newsgroup-name)
     (push
      `((lambda ()
         (when (buffer-name (get-buffer ,gnus-summary-buffer))
           (save-excursion
             (set-buffer (get-buffer ,gnus-summary-buffer))
-            (gnus-cache-possibly-remove-article ,article nil nil nil t)
-            (gnus-summary-mark-as-read ,article gnus-canceled-mark)))))
+            (gnus-cache-possibly-remove-article ,article nil nil nil t)))))
      message-send-actions)))
 
 (defun gnus-draft-send-message (&optional n)
   "Send the current draft."
   (interactive "P")
-  (gnus-set-global-variables)
   (let ((articles (gnus-summary-work-articles n))
        article)
     (while (setq article (pop articles))
@@ -114,7 +112,8 @@
 (defun gnus-draft-send (article &optional group)
   "Send message ARTICLE."
   (gnus-draft-setup article (or group "nndraft:queue"))
-  (let ((message-syntax-checks 'dont-check-for-anything-just-trust-me))
+  (let ((message-syntax-checks 'dont-check-for-anything-just-trust-me)
+       message-send-hook)
     (message-send-and-exit)))
 
 (defun gnus-draft-send-all-messages ()
@@ -126,7 +125,7 @@
 (defun gnus-group-send-drafts ()
   "Send all sendable articles from the queue group."
   (interactive)
-  (gnus-request-group "nndraft:queue")
+  (gnus-activate-group "nndraft:queue")
   (save-excursion
     (let ((articles (nndraft-articles))
          (unsendable (gnus-uncompress-range