;;; gnus-draft.el --- draft message support for Gnus
-;; Copyright (C) 1997 Free Software Foundation, Inc.
+;; Copyright (C) 1997,98 Free Software Foundation, Inc.
-;; Author: Lars Magne Ingebrigtsen <larsi@ifi.uio.no>
+;; Author: Lars Magne Ingebrigtgnus-run-hooks
;; Keywords: news
;; This file is part of GNU Emacs.
(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
(defun gnus-draft-edit-message ()
"Enter a mail/post buffer to edit and send the draft."
(interactive)
- (gnus-set-global-variables)
(let ((article (gnus-summary-article-number)))
+ (gnus-summary-mark-as-read article gnus-canceled-mark)
(gnus-draft-setup article gnus-newsgroup-name)
(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))
- (gnus-cache-possibly-remove-article ,article nil nil nil t)
- (gnus-summary-mark-as-read ,article gnus-canceled-mark)))))
+ (set-buffer ,gnus-summary-buffer)
+ (gnus-cache-possibly-remove-article ,article nil nil nil t)))))
message-send-actions)))
(defun gnus-draft-send-message (&optional n)
"Send the current draft."
(interactive "P")
- (gnus-set-global-variables)
(let ((articles (gnus-summary-work-articles n))
article)
(while (setq article (pop articles))
(gnus-summary-remove-process-mark article)
(unless (memq article gnus-newsgroup-unsendable)
- (gnus-draft-send article)
+ (gnus-draft-send article gnus-newsgroup-name)
(gnus-summary-mark-article article gnus-canceled-mark)))))
-(defun gnus-draft-send (article)
+(defun gnus-draft-send (article &optional group)
"Send message ARTICLE."
- (gnus-draft-setup article "nndraft:queue")
- (let ((message-syntax-checks 'dont-check-for-anything-just-trust-me))
+ (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)))
(defun gnus-draft-send-all-messages ()
(defun gnus-group-send-drafts ()
"Send all sendable articles from the queue group."
(interactive)
- (gnus-request-group "nndraft:queue")
+ (gnus-activate-group "nndraft:queue")
(save-excursion
(let ((articles (nndraft-articles))
(unsendable (gnus-uncompress-range
;;; Utility functions
+;;;!!!If this is byte-compiled, it fails miserably.
+;;;!!!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)
(gnus-setup-message 'forward
- (message-mail)
- (erase-buffer)
- (if (not (gnus-request-restore-buffer narticle group))
- (error "Couldn't restore the article")
- ;; Insert the separator.
- (goto-char (point-min))
- (search-forward "\n\n")
- (forward-char -1)
- (insert mail-header-separator)
- (forward-line 1))))
+ (let ((article narticle))
+ (message-mail)
+ (erase-buffer)
+ (if (not (gnus-request-restore-buffer article group))
+ (error "Couldn't restore the article")
+ ;; Insert the separator.
+ (goto-char (point-min))
+ (search-forward "\n\n")
+ (forward-char -1)
+ (insert mail-header-separator)
+ (forward-line 1)
+ (message-set-auto-save-file-name))))))
(defun gnus-draft-article-sendable-p (article)
"Say whether ARTICLE is sendable."
projects / gnus / blobdiff