X-Git-Url: https://cgit.sxemacs.org/?a=blobdiff_plain;f=lisp%2Fgnus-draft.el;h=1a3a41c5b7e57e13e4468438650f86a88e681a83;hb=a77dd35f2d1dc13eb88e5b153d4c03b83f7eb2c7;hp=fadd0aa90327cbc9b10b6d5bc10985cf3c0eaa8d;hpb=8880e4b7dfd497664c31e11fd7ef8329d4b332cd;p=gnus

diff --git a/lisp/gnus-draft.el b/lisp/gnus-draft.el
index fadd0aa90..1a3a41c5b 100644
--- a/lisp/gnus-draft.el
+++ b/lisp/gnus-draft.el
@@ -1,7 +1,8 @@
 ;;; gnus-draft.el --- draft message support for Gnus
-;; Copyright (C) 1997 Free Software Foundation, Inc.
+;; Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003
+;;        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.
@@ -29,6 +30,8 @@
 (require 'gnus-sum)
 (require 'message)
 (require 'gnus-msg)
+(require 'nndraft)
+(require 'gnus-agent)
 (eval-when-compile (require 'cl))
 
 ;;; Draft minor mode
@@ -43,6 +46,7 @@
 
   (gnus-define-keys gnus-draft-mode-map
     "Dt" gnus-draft-toggle-sending
+    "e"  gnus-draft-edit-message ;; Use `B w' for `gnus-summary-edit-article'
     "De" gnus-draft-edit-message
     "Ds" gnus-draft-send-message
     "DS" gnus-draft-send-all-messages))
@@ -52,7 +56,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.
@@ -60,15 +68,15 @@
 \\{gnus-draft-mode-map}"
   (interactive "P")
   (when (eq major-mode 'gnus-summary-mode)
-    (if (not (set (make-local-variable 'gnus-draft-mode)
-		  (if (null arg) (not gnus-draft-mode)
-		    (> (prefix-numeric-value arg) 0))))
-	(remove-hook 'gnus-message-setup-hook 'gnus-draft-setup-message)
+    (when (set (make-local-variable 'gnus-draft-mode)
+	       (if (null arg) (not gnus-draft-mode)
+		 (> (prefix-numeric-value arg) 0)))
       ;; Set up the menu.
       (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
 
@@ -87,56 +95,182 @@
 (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-draft-setup article)
+  (let ((article (gnus-summary-article-number))
+	(group gnus-newsgroup-name))
+    (gnus-summary-mark-as-read article gnus-canceled-mark)
+    (gnus-draft-setup article group t)
+    (set-buffer-modified-p t)
+    (save-excursion
+      (save-restriction
+	(message-narrow-to-headers)
+	(message-remove-header "date")))
+    (save-buffer)
+    (let ((gnus-verbose-backends nil))
+      (gnus-request-expire-articles (list article) group 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))
-	     (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)
+  (let* ((articles (gnus-summary-work-articles n))
+	 (total (length articles))
+	 article)
     (while (setq article (pop articles))
       (gnus-summary-remove-process-mark article)
       (unless (memq article gnus-newsgroup-unsendable)
-	(gnus-draft-send article)
+	(let ((message-sending-message
+	       (format "Sending message %d of %d..."
+		       (- total (length articles)) total)))
+	  (gnus-draft-send article gnus-newsgroup-name t))
 	(gnus-summary-mark-article article gnus-canceled-mark)))))
 
-(defun gnus-draft-send (article)
+(defun gnus-draft-send (article &optional group interactive)
   "Send message ARTICLE."
-  (gnus-draft-setup article)
-  (message-send-and-exit))
+  (let ((message-syntax-checks (if interactive message-syntax-checks
+				 'dont-check-for-anything-just-trust-me))
+	(message-hidden-headers nil)
+	(message-inhibit-body-encoding (or (not group)
+					   (equal group "nndraft:queue")
+					   message-inhibit-body-encoding))
+	(message-send-hook (and group (not (equal group "nndraft:queue"))
+				message-send-hook))
+	(message-setup-hook (and group (not (equal group "nndraft:queue"))
+				 message-setup-hook))
+	type method move-to)
+    (gnus-draft-setup article (or group "nndraft:queue"))
+    ;; 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-target-move-group-header)
+		     ":") nil t)
+	(skip-syntax-forward "-")
+	(setq move-to (buffer-substring (point) (point-at-eol)))
+	(message-remove-header gnus-agent-target-move-group-header))
+      (goto-char (point-min))
+      (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)))
+    ;; Let Agent restore any GCC lines and have message.el perform them.
+    (gnus-agent-restore-gcc)
+    ;; 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))
+		     (if move-to
+			 (gnus-inews-do-gcc move-to)
+		       (message-send-and-exit)))
+		 (if move-to
+		     (gnus-inews-do-gcc move-to)
+		   (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."
   (interactive)
-  (gnus-uu-mark-buffer)
-  (gnus-draft-send-message))
+  (when (or
+	 gnus-expert-user
+	 (gnus-y-or-n-p
+	  "Send all drafts? "))
+    (gnus-uu-mark-buffer)
+    (gnus-draft-send-message)))
+
+(defun gnus-group-send-queue ()
+  "Send all sendable articles from the queue group."
+  (interactive)
+  (gnus-activate-group "nndraft:queue")
+  (save-excursion
+    (let* ((articles (nndraft-articles))
+	   (unsendable (gnus-uncompress-range
+			(cdr (assq 'unsend
+				   (gnus-info-marks
+				    (gnus-get-info "nndraft:queue"))))))
+	   (gnus-posting-styles nil)
+	   (total (length articles))
+	   article)
+      (while (setq article (pop articles))
+	(unless (memq article unsendable)
+	  (let ((message-sending-message
+		 (format "Sending message %d of %d..."
+			 (- total (length articles)) total)))
+	    (gnus-draft-send article)))))))
+
+;;;###autoload
+(defun gnus-draft-reminder ()
+  "Reminder user if there are unsent drafts."
+  (interactive)
+  (if (gnus-alive-p)
+      (let (active)
+	(catch 'continue
+	  (dolist (group '("nndraft:drafts" "nndraft:queue"))
+	    (setq active (gnus-activate-group group))
+	    (if (and active (>= (cdr active) (car active)))
+		(if (y-or-n-p "There are unsent drafts.  Confirm to exit? ")
+		    (throw 'continue t)
+		  (error "Stop!"))))))))
 
 ;;; Utility functions
 
-(defun gnus-draft-setup (article)
-  (gnus-setup-message 'forward
-    (message-mail)
-    (erase-buffer)
-    (if (not (gnus-request-restore-buffer article gnus-newsgroup-name))
-	(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)
-      (save-buffer 0))))
+;;;!!!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 &optional restore)
+    (let (ga)
+      (gnus-setup-message 'forward
+	(let ((article narticle))
+	  (message-mail)
+	  (erase-buffer)
+	  (if (not (gnus-request-restore-buffer article group))
+	      (error "Couldn't restore the article")
+	    (when (and restore
+		       (equal group "nndraft:queue"))
+	      (mime-to-mml))
+	    ;; Insert the separator.
+	    (goto-char (point-min))
+	    (search-forward "\n\n")
+	    (forward-char -1)
+	    (insert mail-header-separator)
+	    (forward-line 1)
+	    (setq ga (message-fetch-field gnus-draft-meta-information-header))
+	    (message-set-auto-save-file-name))))
+      (gnus-backlog-remove-article group narticle)
+      (when (and ga
+		 (ignore-errors (setq ga (car (read-from-string ga)))))
+	(setq gnus-newsgroup-name
+	      (if (equal (car ga) "") nil (car ga)))
+	(gnus-configure-posting-styles)
+	(setq gnus-message-group-art (cons gnus-newsgroup-name (cadr ga)))
+	(setq message-post-method
+	      `(lambda (arg)
+		 (gnus-post-method arg ,(car ga))))
+	(unless (equal (cadr ga) "")
+	  (message-add-action
+	   `(progn
+	      (gnus-add-mark ,(car ga) 'replied ,(cadr ga))
+	      (gnus-request-set-mark ,(car ga) (list (list (list ,(cadr ga))
+							   'add '(reply)))))
+	   'send))))))
 
 (defun gnus-draft-article-sendable-p (article)
   "Say whether ARTICLE is sendable."
@@ -145,4 +279,3 @@
 (provide 'gnus-draft)
 
 ;;; gnus-draft.el ends here
-