Re: Gnus Agent and mail

[Gaute B Strokkenes <gs234@cam.ac.uk>]

[-- Attachment #1: Type: text/plain, Size: 1560 bytes --]

On 12 mai 2003, gs234@cam.ac.uk wrote:
> On 12 mai 2003, kgreiner@xpediantsolutions.com wrote:
> >Gaute B Strokkenes <gs234@cam.ac.uk> writes:
> >
> >>Then there would be no way to send mail without temporarily setting
> >>gnus-agent-queue-mail to t or nil.
> >
> >That last part was what I was hoping to here.  Wouldn't your patch
> >work just as well if you bound gnus-agent-queue-mail to nil as your
> >original bind of message-send-mail-real-function?  
> 
> You're quite right; that is a better way to do it.
> 
> >>Hmm.  Actually, is is possible to enter the queue group and send
> >>messages with `D s' and `D S'.  I need to take care of those cases
> >>as well.
> >
> >Hmmm... I'm glad you thought of that now.
> 
> I'll move the rebinding down to gnus-draft-send, suitably guarded.

Here is an improved version:

2003-05-12  Gaute B Strokkenes <gs234@srcf.ucam.org>

	* gnus-agent.el (gnus-agent-queue-mail): New variable.
	(gnus-agent-send-mail): Use it.

	* gnus-draft.el (gnus-group-send-queue): Pass the group name
	"nndraft:queue" along to gnus-draft-send.
	(gnus-draft-send): Rebind gnus-agent-queue-mail to nil when
	group is "nndraft:queue".

I was slightly unsure about passing "nndraft:queue" down to
gnus-draft-send.  The reason for this is that gnus-draft-send seems to
use this argument in non-obvious ways to set several message-related
variables.  However it already special-cases "nndraft:queue" and I
made sure the behaviour is not actually changed.

I haven't implemented a butt-saver for Kai, though.  I'll have to find
out how...


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: gaqm.diff --]
[-- Type: text/x-patch, Size: 2265 bytes --]

Index: lisp/gnus-agent.el
===================================================================
RCS file: /usr/local/cvsroot/gnus/lisp/gnus-agent.el,v
retrieving revision 6.172
diff -u -r6.172 gnus-agent.el
--- lisp/gnus-agent.el	12 May 2003 18:43:29 -0000	6.172
+++ lisp/gnus-agent.el	12 May 2003 20:30:11 -0000
@@ -169,6 +169,15 @@
   :type '(radio (const :format "Enable " ENABLE)
                 (const :format "Disable " DISABLE)))
 
+(defcustom gnus-agent-queue-mail t
+  "Whether and when outgoing mail should be queued by the agent.  When
+`always', always queue outgoing mail.  When `nil', never queue.
+Otherwise, queue if and only if unplugged."
+  :group 'gnus-agent
+  :type '(radio (const :format "Always" always)
+		(const :format "Never" nil)
+		(const :format "When plugged" t)))
+ 
 (defcustom gnus-agent-expire-unagentized-dirs t
 "Have gnus-agent-expire scan the directories under
 \(gnus-agent-directory) for groups that are no longer agentized.  When
@@ -625,7 +634,8 @@
      'gnus-dummy '((gnus-draft-mode)))))
 
 (defun gnus-agent-send-mail ()
-  (if gnus-plugged
+  (if (or (not gnus-agent-queue-mail)
+	  (and gnus-plugged (not (eq gnus-agent-queue-mail 'always))))
       (funcall gnus-agent-send-mail-function)
     (goto-char (point-min))
     (re-search-forward
Index: lisp/gnus-draft.el
===================================================================
RCS file: /usr/local/cvsroot/gnus/lisp/gnus-draft.el,v
retrieving revision 6.21
diff -u -r6.21 gnus-draft.el
--- lisp/gnus-draft.el	12 Apr 2003 23:09:52 -0000	6.21
+++ lisp/gnus-draft.el	12 May 2003 20:30:11 -0000
@@ -141,6 +141,9 @@
 				message-send-hook))
 	(message-setup-hook (and group (not (equal group "nndraft:queue"))
 				 message-setup-hook))
+	(gnus-agent-queue-mail (if (equal group "nndraft:queue")
+				   nil
+				 gnus-agent-queue-mail))
 	type method move-to)
     (gnus-draft-setup article (or group "nndraft:queue"))
     ;; We read the meta-information that says how and where
@@ -206,7 +209,7 @@
 	  (let ((message-sending-message
 		 (format "Sending message %d of %d..."
 			 (- total (length articles)) total)))
-	    (gnus-draft-send article)))))))
+	    (gnus-draft-send article "nndraft:queue")))))))
 
 ;;;###autoload
 (defun gnus-draft-reminder ()

[-- Attachment #3: Type: text/plain, Size: 147 bytes --]

-- 
Gaute Strokkenes                        http://www.srcf.ucam.org/~gs234/
While I'm in LEVITTOWN I thought I'd like to see the NUCLEAR FAMILY!!