Importing Oort Gnus v0.04.

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

diff --git a/lisp/gnus-draft.el b/lisp/gnus-draft.el
index 47b0939..9b18989 100644 (file)
--- a/lisp/gnus-draft.el
+++ b/lisp/gnus-draft.el
@@ -1,5 +1,5 @@
 ;;; gnus-draft.el --- draft message support for Gnus
-;; Copyright (C) 1997, 1998, 1999, 2000
+;; Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002
 ;;        Free Software Foundation, Inc.
 
 ;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
@@ -94,13 +94,18 @@
 (defun gnus-draft-edit-message ()
   "Enter a mail/post buffer to edit and send the draft."
   (interactive)
-  (let ((article (gnus-summary-article-number)))
+  (let ((article (gnus-summary-article-number))
+       (group gnus-newsgroup-name))
     (gnus-summary-mark-as-read article gnus-canceled-mark)
-    (gnus-draft-setup article gnus-newsgroup-name t)
+    (gnus-draft-setup article group t)
     (set-buffer-modified-p t)
+    (save-excursion
+      (save-restriction
+       (message-narrow-to-headers)
+       (message-remove-header "date")))
     (save-buffer)
     (let ((gnus-verbose-backends nil))
-      (gnus-request-expire-articles (list article) gnus-newsgroup-name t))
+      (gnus-request-expire-articles (list article) group t))
     (push
      `((lambda ()
         (when (gnus-buffer-exists-p ,gnus-summary-buffer)
@@ -118,8 +123,8 @@
     (while (setq article (pop articles))
       (gnus-summary-remove-process-mark article)
       (unless (memq article gnus-newsgroup-unsendable)
-       (let ((message-sending-message 
-              (format "Sending message %d of %d..." 
+       (let ((message-sending-message
+              (format "Sending message %d of %d..."
                       (- total (length articles)) total)))
          (gnus-draft-send article gnus-newsgroup-name t))
        (gnus-summary-mark-article article gnus-canceled-mark)))))
@@ -128,7 +133,7 @@
   "Send message ARTICLE."
   (let ((message-syntax-checks (if interactive nil
                                 'dont-check-for-anything-just-trust-me))
-       (message-inhibit-body-encoding (or (not group) 
+       (message-inhibit-body-encoding (or (not group)
                                           (equal group "nndraft:queue")
                                           message-inhibit-body-encoding))
        (message-send-hook (and group (not (equal group "nndraft:queue"))
@@ -171,7 +176,7 @@
   (gnus-uu-mark-buffer)
   (gnus-draft-send-message))
 
-(defun gnus-group-send-drafts ()
+(defun gnus-group-send-queue ()
   "Send all sendable articles from the queue group."
   (interactive)
   (gnus-activate-group "nndraft:queue")
@@ -185,8 +190,8 @@
           article)
       (while (setq article (pop articles))
        (unless (memq article unsendable)
-         (let ((message-sending-message 
-                (format "Sending message %d of %d..." 
+         (let ((message-sending-message
+                (format "Sending message %d of %d..."
                         (- total (length articles)) total)))
            (gnus-draft-send article)))))))
 
@@ -231,14 +236,21 @@
            (forward-line 1)
            (setq ga (message-fetch-field gnus-draft-meta-information-header))
            (message-set-auto-save-file-name))))
+      (gnus-backlog-remove-article group narticle)
       (when (and ga
                 (ignore-errors (setq ga (car (read-from-string ga)))))
+       (setq gnus-newsgroup-name
+             (if (equal (car ga) "") nil (car ga)))
        (setq message-post-method
              `(lambda (arg)
                 (gnus-post-method arg ,(car ga))))
-       (message-add-action
-        `(gnus-add-mark ,(car ga) 'replied ,(cadr ga))
-        'send)))))
+       (unless (equal (cadr ga) "")
+         (message-add-action
+          `(progn
+             (gnus-add-mark ,(car ga) 'replied ,(cadr ga))
+             (gnus-request-set-mark ,(car ga) (list (list (list ,(cadr ga))
+                                                          'add '(reply)))))
+          'send))))))
 
 (defun gnus-draft-article-sendable-p (article)
   "Say whether ARTICLE is sendable."