* nnshimbun.el (nnshimbun-request-expire-articles): Fix inhibiting the

[elisp/gnus.git-] / lisp / gnus-draft.el

diff --git a/lisp/gnus-draft.el b/lisp/gnus-draft.el
index 849dc9b..c9a40e7 100644 (file)
--- a/lisp/gnus-draft.el
+++ b/lisp/gnus-draft.el
@@ -199,6 +199,20 @@
                         (- 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
 
 (defcustom gnus-draft-decoding-function
@@ -213,20 +227,30 @@
 ;;;!!!but for the time being, we'll just run this tiny function uncompiled.
 
 (defun gnus-draft-setup-for-editing (narticle group)
-  (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")
-       (funcall gnus-draft-decoding-function)
-       ;; 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)))))
+  (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")
+         (funcall gnus-draft-decoding-function)
+         ;; 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))))
+    (when (and ga
+              (ignore-errors (setq ga (car (read-from-string ga)))))
+      (setq message-post-method
+           `(lambda (arg)
+              (gnus-post-method arg ,(car ga))))
+      (message-add-action
+       `(gnus-add-mark ,(car ga) 'replied ,(cadr ga))
+       'send))))
 
 (defvar gnus-draft-send-draft-buffer " *send draft*")
 (defun gnus-draft-setup-for-sending (narticle group)