;;; gnus-draft.el --- draft message support for Semi-gnus
-;; Copyright (C) 1997,98 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>
+;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
+;; MORIOKA Tomohiko <morioka@jaist.ac.jp>
+;; Tatsuya Ichikawa <t-ichi@po.shiojiri.ne.jp>
;; Keywords: mail, news, MIME, offline
;; This file is part of GNU Emacs.
(require 'message)
(require 'gnus-msg)
(require 'nndraft)
+(require 'gnus-agent)
(eval-when-compile (require 'cl))
;;; Draft minor mode
(interactive)
(let ((article (gnus-summary-article-number)))
(gnus-summary-mark-as-read article gnus-canceled-mark)
- (gnus-draft-setup article gnus-newsgroup-name)
+ (gnus-draft-setup-for-editing 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 (gnus-buffer-exists-p ,gnus-summary-buffer)
(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-hook)
- (message-send-and-exit)))
+ (gnus-draft-setup-for-sending article (or group "nndraft:queue"))
+ (let ((message-syntax-checks (if interactive nil
+ 'dont-check-for-anything-just-trust-me))
+ 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 (let ((mail-header-separator ""))
+ (cond ((eq type 'news)
+ (mime-edit-maybe-split-and-send
+ (function
+ (lambda ()
+ (interactive)
+ (funcall message-send-news-function method)
+ )))
+ (funcall message-send-news-function method)
+ )
+ ((eq type 'mail)
+ (mime-edit-maybe-split-and-send
+ (function
+ (lambda ()
+ (interactive)
+ (funcall message-send-mail-function)
+ )))
+ (funcall message-send-mail-function)
+ t)))
+ (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."
;;; Utility functions
(defcustom gnus-draft-decoding-function
- (function
- (lambda ()
- (mime-edit-decode-buffer nil)
- (eword-decode-header)
- ))
+ #'mime-edit-decode-message-in-buffer
"*Function called to decode the message from network representation."
:group 'gnus-agent
:type 'function)
;;;!!!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)
+(defun gnus-draft-setup-for-editing (narticle group)
(gnus-setup-message 'forward
(let ((article narticle))
(message-mail)
(forward-char -1)
(insert mail-header-separator)
(forward-line 1)
- (message-set-auto-save-file-name))))))
+ (message-set-auto-save-file-name)))))
+
+(defvar gnus-draft-send-draft-buffer " *send draft*")
+(defun gnus-draft-setup-for-sending (narticle group)
+ (let ((article narticle))
+ (if (not (get-buffer gnus-draft-send-draft-buffer))
+ (get-buffer-create gnus-draft-send-draft-buffer))
+ (set-buffer gnus-draft-send-draft-buffer)
+ (erase-buffer)
+ (if (not (gnus-request-restore-buffer article group))
+ (error "Couldn't restore the article")
+ )))
(defun gnus-draft-article-sendable-p (article)
"Say whether ARTICLE is sendable."