(gnus-point-at-bol, gnus-point-at-eol): Remove.

[gnus] / lisp / gnus-draft.el

diff --git a/lisp/gnus-draft.el b/lisp/gnus-draft.el
index 2627c50..1a3a41c 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, 2003
 ;;        Free Software Foundation, Inc.
 
 ;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
@@ -46,6 +46,7 @@
 
   (gnus-define-keys gnus-draft-mode-map
     "Dt" gnus-draft-toggle-sending
+    "e"  gnus-draft-edit-message ;; Use `B w' for `gnus-summary-edit-article'
     "De" gnus-draft-edit-message
     "Ds" gnus-draft-send-message
     "DS" gnus-draft-send-all-messages))
@@ -131,8 +132,9 @@
 
 (defun gnus-draft-send (article &optional group interactive)
   "Send message ARTICLE."
-  (let ((message-syntax-checks (if interactive nil
+  (let ((message-syntax-checks (if interactive message-syntax-checks
                                 'dont-check-for-anything-just-trust-me))
+       (message-hidden-headers nil)
        (message-inhibit-body-encoding (or (not group)
                                           (equal group "nndraft:queue")
                                           message-inhibit-body-encoding))
@@ -140,12 +142,19 @@
                                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) (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)
@@ -164,8 +173,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)))))
@@ -173,10 +186,14 @@
 (defun gnus-draft-send-all-messages ()
   "Send all the sendable drafts."
   (interactive)
-  (gnus-uu-mark-buffer)
-  (gnus-draft-send-message))
+  (when (or
+        gnus-expert-user
+        (gnus-y-or-n-p
+         "Send all drafts? "))
+    (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")
@@ -186,6 +203,7 @@
                        (cdr (assq 'unsend
                                   (gnus-info-marks
                                    (gnus-get-info "nndraft:queue"))))))
+          (gnus-posting-styles nil)
           (total (length articles))
           article)
       (while (setq article (pop articles))
@@ -205,7 +223,7 @@
          (dolist (group '("nndraft:drafts" "nndraft:queue"))
            (setq active (gnus-activate-group group))
            (if (and active (>= (cdr active) (car active)))
-               (if (y-or-n-p "There are unsent drafts. Confirm to exit?")
+               (if (y-or-n-p "There are unsent drafts.  Confirm to exit? ")
                    (throw 'continue t)
                  (error "Stop!"))))))))
 
@@ -241,12 +259,18 @@
                 (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)
                 (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."