Synch with Oort Gnus and Nana-gnus 7.1.0.26.

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

diff --git a/lisp/gnus-draft.el b/lisp/gnus-draft.el
index 4b015c1..4704739 100644 (file)
--- a/lisp/gnus-draft.el
+++ b/lisp/gnus-draft.el
@@ -95,9 +95,10 @@
 (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-for-editing article gnus-newsgroup-name)
+    (gnus-draft-setup-for-editing article group)
     (set-buffer-modified-p t)
     (save-excursion
       (save-restriction
@@ -105,7 +106,7 @@
        (message-remove-header "date")))
     (message-save-drafts)
     (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)
@@ -248,12 +249,15 @@
     (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
+        `(gnus-add-mark ,(car ga) 'replied ,(cadr ga))
+        'send)))))
 
 (defvar gnus-draft-send-draft-buffer " *send draft*")
 (defun gnus-draft-setup-for-sending (narticle group)