From mboxrd@z Thu Jan 1 00:00:00 1970 X-Msuck: nntp://news.gmane.io/gmane.emacs.gnus.general/31904 Path: main.gmane.org!not-for-mail From: Rod Whitby Newsgroups: gmane.emacs.gnus.general Subject: Patches to fix expiring when expiry-target is a string Date: 25 Jul 2000 06:16:52 +0930 Sender: owner-ding@hpc.uh.edu Message-ID: NNTP-Posting-Host: coloc-standby.netfonds.no Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Trace: main.gmane.org 1035168262 16731 80.91.224.250 (21 Oct 2002 02:44:22 GMT) X-Complaints-To: usenet@main.gmane.org NNTP-Posting-Date: Mon, 21 Oct 2002 02:44:22 +0000 (UTC) Return-Path: Original-Received: from fisher.math.uh.edu (fisher.math.uh.edu [129.7.128.35]) by mailhost.sclp.com (Postfix) with ESMTP id B768ED051E for ; Mon, 24 Jul 2000 04:53:59 -0400 (EDT) Original-Received: from sina.hpc.uh.edu (lists@Sina.HPC.UH.EDU [129.7.3.5]) by fisher.math.uh.edu (8.9.1/8.9.1) with ESMTP id DAC08250; Mon, 24 Jul 2000 03:53:49 -0500 (CDT) Original-Received: by sina.hpc.uh.edu (TLB v0.09a (1.20 tibbs 1996/10/09 22:03:07)); Mon, 24 Jul 2000 03:52:49 -0500 (CDT) Original-Received: from mailhost.sclp.com (postfix@sclp3.sclp.com [204.252.123.139]) by sina.hpc.uh.edu (8.9.3/8.9.3) with ESMTP id DAA10272 for ; Mon, 24 Jul 2000 03:52:27 -0500 (CDT) Original-Received: from motgate3.mot.com (unknown [144.189.100.103]) by mailhost.sclp.com (Postfix) with ESMTP id D1957D051E for ; Mon, 24 Jul 2000 04:52:59 -0400 (EDT) Original-Received: [from mothost.mot.com (mothost.mot.com [129.188.137.101]) by motgate3.mot.com (motgate3 2.1) with ESMTP id BAA01681 for ; Mon, 24 Jul 2000 01:51:34 -0700 (MST)] Original-Received: [from fraser.asc.corp.mot.com (fraser.asc.corp.mot.com [217.1.104.8]) by mothost.mot.com (MOT-mothost 2.0) with ESMTP id BAA23946 for ; Mon, 24 Jul 2000 01:52:54 -0700 (MST)] Original-Received: from a11375-rw.asc.corp.mot.com.asc.corp.mot.com (a11375-rw [217.1.106.149]) by fraser.asc.corp.mot.com (8.8.7/8.8.7) with SMTP id SAA03864 for ; Mon, 24 Jul 2000 18:22:51 +0930 (CST) Original-To: ding@gnus.org Original-Lines: 115 User-Agent: Gnus/5.0808 (Gnus v5.8.8) XEmacs/21.2 (Molpe) Precedence: list X-Majordomo: 1.94.jlt7 Xref: main.gmane.org gmane.emacs.gnus.general:31904 X-Report-Spam: http://spam.gmane.org/gmane.emacs.gnus.general:31904 The functionality of setting nnmail-expiry-target to a string (i.e. a group to which the expired articles should be moved, instead of being deleted) just plain does not work. Therefore, there must be no-one but me using it :-) Anyway, here's some patches (against a pretty recent snapshot, and I don't think anything around them has changed since) that do the following: 1/ [gnus-sum.el, gnus-summary-expire-articles] Fix the handling of expiry-target group parameters. 2/ [nnml.el, nnml-request-expire-articles] Fix the calls to nnml-request-article (the filename was being passed instead of the article number) and nnmail-expiry-target-group (nnml-current-directory is changed by nnml-request-accept-article, causing it to be incorrect for the next article to be expired). 3/ [nnmail.el, nnmail-expiry-target-group] Fix the call to gnus-request-accept-article so that body encoding is *not* done. Encoding is not done on incoming mail, so why should it be done on expired mail? This is my first patch submission to the ding mailing list, so please let me know if I should have submitted these in another format (in particular, how do you get the nice ChangeLog entries?), and also how I should proceed in getting these checked into CVS. For those interested, the reason why I found these problems is because I have just set up my nnml:INBOX to expire to a nnml:DELETED folder immediately, and then the nnml:DELETED folder really deletes the messages after a long time. Sort of like the Trash folder in Netscape, only better :-) Now I can set display to 'all in my nnml:INBOX group parameters and use the tick marks properly, while still seeing my other unfiled mail when I enter the folder normally. diff -c /gnu/XEmacs/site-packages/gnus/lisp/gnus-sum.el~ /gnu/XEmacs/site-packages/gnus/lisp/gnus-sum.el *** /gnu/XEmacs/site-packages/gnus/lisp/gnus-sum.el~ Tue Jul 25 05:56:17 2000 --- /gnu/XEmacs/site-packages/gnus/lisp/gnus-sum.el Tue Jul 25 05:56:17 2000 *************** *** 7682,7687 **** --- 7682,7690 ---- (expiry-wait (if now 'immediate (gnus-group-find-parameter gnus-newsgroup-name 'expiry-wait))) + (nnmail-expiry-target + (or (gnus-group-find-parameter gnus-newsgroup-name 'expiry-target) + nnmail-expiry-target)) es) (when expirable ;; There are expirable articles in this group, so we run them diff -c /gnu/XEmacs/site-packages/gnus/lisp/nnml.el~ /gnu/XEmacs/site-packages/gnus/lisp/nnml.el *** /gnu/XEmacs/site-packages/gnus/lisp/nnml.el~ Tue Jul 25 05:07:35 2000 --- /gnu/XEmacs/site-packages/gnus/lisp/nnml.el Tue Jul 25 05:07:35 2000 *************** *** 289,300 **** ;; Allow a special target group. (unless (eq nnmail-expiry-target 'delete) (with-temp-buffer ! (nnml-request-article article group server (current-buffer)) ! (nnmail-expiry-target-group ! nnmail-expiry-target group))) (nnheader-message 5 "Deleting article %s in %s" ! article group) (condition-case () (funcall nnmail-delete-file-function article) (file-error --- 289,301 ---- ;; Allow a special target group. (unless (eq nnmail-expiry-target 'delete) (with-temp-buffer ! (nnml-request-article number group server (current-buffer)) ! (let ((nnml-current-directory nil)) ! (nnmail-expiry-target-group ! nnmail-expiry-target group)))) (nnheader-message 5 "Deleting article %s in %s" ! number group) (condition-case () (funcall nnmail-delete-file-function article) (file-error diff -c /gnu/XEmacs/site-packages/gnus/lisp/nnmail.el~ /gnu/XEmacs/site-packages/gnus/lisp/nnmail.el *** /gnu/XEmacs/site-packages/gnus/lisp/nnmail.el~ Tue Jul 25 05:08:51 2000 --- /gnu/XEmacs/site-packages/gnus/lisp/nnmail.el Tue Jul 25 05:08:51 2000 *************** *** 1610,1616 **** (when (nnheader-functionp target) (setq target (funcall target group))) (unless (eq target 'delete) ! (gnus-request-accept-article target))) (defun nnmail-check-syntax () "Check (and modify) the syntax of the message in the current buffer." --- 1610,1616 ---- (when (nnheader-functionp target) (setq target (funcall target group))) (unless (eq target 'delete) ! (gnus-request-accept-article target nil nil t))) (defun nnmail-check-syntax () "Check (and modify) the syntax of the message in the current buffer." -- -- Rod Whitby, Snr Staff Engr, Electronic Design Automation -- -- Motorola Australia Software Centre - Adelaide, Australia -- -- Phone: +61 8 8203 3526, Fax: +61 8 8203 3501, --