X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=lisp%2Fgnus-draft.el;h=4ebe3b33d92c568d160f3a1009f66b6d5dd75359;hb=30d9f23f0291edcefeca1958befadb992d2982b5;hp=9d00c55af34967801e03ecae7630037b11de0442;hpb=d39aa7b81f5bd777d34a239f4d4d4afee5245d18;p=elisp%2Fgnus.git-

diff --git a/lisp/gnus-draft.el b/lisp/gnus-draft.el
index 9d00c55..4ebe3b3 100644
--- a/lisp/gnus-draft.el
+++ b/lisp/gnus-draft.el
@@ -1,9 +1,8 @@
 ;;; 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>
-;;         MORIOKA Tomohiko <morioka@jaist.ac.jp>
-;; Keywords: mail, news, MIME, offline
+;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
+;; Keywords: news
 
 ;; This file is part of GNU Emacs.
 
@@ -31,6 +30,7 @@
 (require 'message)
 (require 'gnus-msg)
 (require 'nndraft)
+(require 'gnus-agent)
 (eval-when-compile (require 'cl))
 
 ;;; Draft minor mode
@@ -54,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.
@@ -69,7 +73,8 @@
       (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))))
+      (mml-mode)
+      (gnus-run-hooks 'gnus-draft-mode-hook))))
 
 ;;; Commands
 
@@ -91,11 +96,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)))
 
@@ -107,14 +116,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))
+	(message-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,18 +175,10 @@
 
 ;;; Utility functions
 
-(defcustom gnus-draft-decoding-function
-  (function
-   (lambda ()
-     (mime-edit-decode-buffer nil)
-     (eword-decode-header)
-     ))
-  "Function called to decode the message from network representation."
-  :group 'gnus-agent
-  :type 'function)
-
 ;;;!!!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)
@@ -158,16 +186,15 @@
     (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.
-	(funcall gnus-draft-decoding-function)
 	(goto-char (point-min))
 	(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."