-;;; gnus-draft.el --- draft message support for Gnus
-;; Copyright (C) 1997 Free Software Foundation, Inc.
+;;; gnus-draft.el --- draft message support for Semi-gnus
+;; Copyright (C) 1997,98 Free Software Foundation, Inc.
-;; Author: Lars Magne Ingebrigtsen <larsi@ifi.uio.no>
+;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
;; MORIOKA Tomohiko <morioka@jaist.ac.jp>
;; Keywords: mail, news, MIME, offline
(require 'message)
(require 'gnus-msg)
(require 'nndraft)
+(require 'gnus-agent)
(eval-when-compile (require 'cl))
;;; Draft minor mode
(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.
(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
(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 (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)))
(defun gnus-draft-send (article &optional group)
"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)))
+ (gnus-draft-setup-for-sending article (or group "nndraft:queue"))
+ (let ((message-syntax-checks '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."
(defcustom gnus-draft-decoding-function
(function
(lambda ()
- (mime-edit-decode-buffer nil)
+ (mime-edit-decode-message-in-buffer nil)
(eword-decode-header)
))
- "Function called to decode the message from network representation."
+ "*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)
+(defun gnus-draft-setup-for-editing (narticle group)
(gnus-setup-message 'forward
(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.
(search-forward "\n\n")
(forward-char -1)
(insert mail-header-separator)
- (forward-line 1))))))
+ (forward-line 1)
+ (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")
+ )))
+;; For draft TEST
(defun gnus-draft-article-sendable-p (article)
"Say whether ARTICLE is sendable."
projects / elisp / gnus.git- / blobdiff