Import Oort Gnus v0.16.

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

diff --git a/lisp/gnus-draft.el b/lisp/gnus-draft.el
index 6c9c13c..cbde8b0 100644 (file)
--- a/lisp/gnus-draft.el
+++ b/lisp/gnus-draft.el
@@ -140,13 +140,20 @@
                                message-send-hook))
        (message-setup-hook (and group (not (equal group "nndraft:queue"))
                                 message-setup-hook))
-       type method)
+       type method move-to)
     (gnus-draft-setup article (or group "nndraft:queue"))
     ;; We read the meta-information that says how and where
     ;; this message is to be sent.
     (save-restriction
       (message-narrow-to-head)
       (when (re-search-forward
+            (concat "^" (regexp-quote gnus-agent-target-move-group-header)
+                    ":") nil t)
+       (skip-syntax-forward "-")
+       (setq move-to (buffer-substring (point) (gnus-point-at-eol)))
+       (message-remove-header gnus-agent-target-move-group-header))
+      (goto-char (point-min))
+      (when (re-search-forward
             (concat "^" (regexp-quote gnus-agent-meta-information-header) ":")
             nil t)
        (setq type (ignore-errors (read (current-buffer)))
@@ -164,8 +171,12 @@
                         (message-this-is-mail (eq type 'mail))
                         (gnus-post-method method)
                         (message-post-method method))
-                    (message-send-and-exit))
-                (message-send-and-exit)))
+                    (if move-to
+                        (gnus-inews-do-gcc move-to)
+                      (message-send-and-exit)))
+                (if move-to
+                    (gnus-inews-do-gcc move-to)
+                  (message-send-and-exit))))
       (let ((gnus-verbose-backends nil))
        (gnus-request-expire-articles
         (list article) (or group "nndraft:queue") t)))))
@@ -242,6 +253,7 @@
                 (ignore-errors (setq ga (car (read-from-string ga)))))
        (setq gnus-newsgroup-name
              (if (equal (car ga) "") nil (car ga)))
+       (gnus-configure-posting-styles)
        (setq gnus-message-group-art (cons gnus-newsgroup-name (cadr ga)))
        (setq message-post-method
              `(lambda (arg)