Importing pgnus-0.79

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

diff --git a/lisp/gnus-draft.el b/lisp/gnus-draft.el
index b17356b..678f6d9 100644 (file)
--- a/lisp/gnus-draft.el
+++ b/lisp/gnus-draft.el
@@ -1,7 +1,7 @@
 ;;; gnus-draft.el --- draft message support for Gnus
-;; Copyright (C) 1997 Free Software Foundation, Inc.
+;; Copyright (C) 1997,98,99 Free Software Foundation, Inc.
 
-;; Author: Lars Magne Ingebrigtsen <larsi@ifi.uio.no>
+;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
 ;; Keywords: news
 
 ;; This file is part of GNU Emacs.
@@ -30,6 +30,7 @@
 (require 'message)
 (require 'gnus-msg)
 (require 'nndraft)
+(require 'gnus-agent)
 (eval-when-compile (require 'cl))
 
 ;;; Draft minor mode
@@ -53,7 +54,11 @@
     (easy-menu-define
      gnus-draft-menu gnus-draft-mode-map ""
      '("Drafts"
-       ["Toggle whether to send" gnus-draft-toggle-sending t]))))
+       ["Toggle whether to send" gnus-draft-toggle-sending t]
+       ["Edit" gnus-draft-edit-message t]
+       ["Send selected message(s)" gnus-draft-send-message t]
+       ["Send all messages" gnus-draft-send-all-messages t]
+       ["Delete draft" gnus-summary-delete-article t]))))
 
 (defun gnus-draft-mode (&optional arg)
   "Minor mode for providing a draft summary buffers.
@@ -68,7 +73,7 @@
       (when (gnus-visual-p 'draft-menu 'menu)
        (gnus-draft-make-menu-bar))
       (gnus-add-minor-mode 'gnus-draft-mode " Draft" gnus-draft-mode-map)
-      (run-hooks 'gnus-draft-mode-hook))))
+      (gnus-run-hooks 'gnus-draft-mode-hook))))
 
 ;;; Commands
 
@@ -90,11 +95,15 @@
   (let ((article (gnus-summary-article-number)))
     (gnus-summary-mark-as-read article gnus-canceled-mark)
     (gnus-draft-setup article gnus-newsgroup-name)
+    (set-buffer-modified-p t)
+    (save-buffer)
+    (let ((gnus-verbose-backends nil))
+      (gnus-request-expire-articles (list article) gnus-newsgroup-name t))
     (push
      `((lambda ()
-        (when (buffer-name (get-buffer ,gnus-summary-buffer))
+        (when (gnus-buffer-exists-p ,gnus-summary-buffer)
           (save-excursion
-            (set-buffer (get-buffer ,gnus-summary-buffer))
+            (set-buffer ,gnus-summary-buffer)
             (gnus-cache-possibly-remove-article ,article nil nil nil t)))))
      message-send-actions)))
 
@@ -106,14 +115,41 @@
     (while (setq article (pop articles))
       (gnus-summary-remove-process-mark article)
       (unless (memq article gnus-newsgroup-unsendable)
-       (gnus-draft-send article gnus-newsgroup-name)
+       (gnus-draft-send article gnus-newsgroup-name t)
        (gnus-summary-mark-article article gnus-canceled-mark)))))
 
-(defun gnus-draft-send (article &optional group)
+(defun gnus-draft-send (article &optional group interactive)
   "Send message ARTICLE."
   (gnus-draft-setup article (or group "nndraft:queue"))
-  (let ((message-syntax-checks 'dont-check-for-anything-just-trust-me))
-    (message-send-and-exit)))
+  (let ((message-syntax-checks (if interactive nil
+                                'dont-check-for-anything-just-trust-me))
+       (messgage-inhibit-body-encoding t)
+       message-send-hook type method)
+    ;; 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-meta-information-header) ":")
+            nil t)
+       (setq type (ignore-errors (read (current-buffer)))
+             method (ignore-errors (read (current-buffer))))
+       (message-remove-header gnus-agent-meta-information-header)))
+    ;; Then we send it.  If we have no meta-information, we just send
+    ;; it and let Message figure out how.
+    (when (and (or (null method)
+                  (gnus-server-opened method)
+                  (gnus-open-server method))
+              (if type
+                  (let ((message-this-is-news (eq type 'news))
+                        (message-this-is-mail (eq type 'mail))
+                        (gnus-post-method method)
+                        (message-post-method method))
+                    (message-send-and-exit))
+                (message-send-and-exit)))
+      (let ((gnus-verbose-backends nil))
+       (gnus-request-expire-articles
+        (list article) (or group "nndraft:queue") t)))))
 
 (defun gnus-draft-send-all-messages ()
   "Send all the sendable drafts."
@@ -139,7 +175,9 @@
 ;;; Utility functions
 
 ;;;!!!If this is byte-compiled, it fails miserably.
-;;;!!!I have no idea why.
+;;;!!!This is because `gnus-setup-message' uses uninterned symbols.
+;;;!!!This has been fixed in recent versions of Emacs and XEmacs,
+;;;!!!but for the time being, we'll just run this tiny function uncompiled.
 
 (progn
 (defun gnus-draft-setup (narticle group)
@@ -147,7 +185,6 @@
     (let ((article narticle))
       (message-mail)
       (erase-buffer)
-      (message "%s %s" group article)
       (if (not (gnus-request-restore-buffer article group))
          (error "Couldn't restore the article")
        ;; Insert the separator.
@@ -155,7 +192,8 @@
        (search-forward "\n\n")
        (forward-char -1)
        (insert mail-header-separator)
-       (forward-line 1))))))
+       (forward-line 1)
+       (message-set-auto-save-file-name))))))
 
 (defun gnus-draft-article-sendable-p (article)
   "Say whether ARTICLE is sendable."