From mboxrd@z Thu Jan 1 00:00:00 1970 X-Msuck: nntp://news.gmane.io/gmane.emacs.gnus.general/44811 Path: main.gmane.org!not-for-mail From: Josh Huber Newsgroups: gmane.emacs.gnus.general Subject: nnmail-cache-insert fixes Date: Mon, 13 May 2002 16:29:12 -0400 Sender: owner-ding@hpc.uh.edu Message-ID: <87vg9rn65j.fsf@alum.wpi.edu> NNTP-Posting-Host: localhost.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Trace: main.gmane.org 1021321765 15376 127.0.0.1 (13 May 2002 20:29:25 GMT) X-Complaints-To: usenet@main.gmane.org NNTP-Posting-Date: Mon, 13 May 2002 20:29:25 +0000 (UTC) Return-path: Original-Received: from malifon.math.uh.edu ([129.7.128.13]) by main.gmane.org with esmtp (Exim 3.33 #1 (Debian)) id 177MRg-0003zt-00 for ; Mon, 13 May 2002 22:29:24 +0200 Original-Received: from sina.hpc.uh.edu ([129.7.128.10] ident=lists) by malifon.math.uh.edu with esmtp (Exim 3.20 #1) id 177MQS-0003mq-00; Mon, 13 May 2002 15:28:08 -0500 Original-Received: by sina.hpc.uh.edu (TLB v0.09a (1.20 tibbs 1996/10/09 22:03:07)); Mon, 13 May 2002 15:28:26 -0500 (CDT) Original-Received: from sclp3.sclp.com (qmailr@sclp3.sclp.com [209.196.61.66]) by sina.hpc.uh.edu (8.9.3/8.9.3) with SMTP id PAA02779 for ; Mon, 13 May 2002 15:28:11 -0500 (CDT) Original-Received: (qmail 24140 invoked by alias); 13 May 2002 20:27:48 -0000 Original-Received: (qmail 24135 invoked from network); 13 May 2002 20:27:48 -0000 Original-Received: from quimby.gnus.org (80.91.224.244) by gnus.org with SMTP; 13 May 2002 20:27:48 -0000 Original-Received: from news by quimby.gnus.org with local (Exim 3.12 #1 (Debian)) id 177MaV-00089i-00 for ; Mon, 13 May 2002 22:38:31 +0200 Original-To: ding@gnus.org Original-Path: not-for-mail Original-Newsgroups: gnus.ding Original-Lines: 192 Original-NNTP-Posting-Host: lowell.missioncriticallinux.com Original-X-Trace: quimby.gnus.org 1021322311 31352 64.244.21.16 (13 May 2002 20:38:31 GMT) Original-X-Complaints-To: usenet@quimby.gnus.org Original-NNTP-Posting-Date: 13 May 2002 20:38:31 GMT X-PGP-KeyID: 6B21489A X-Face: C%mBb*K1^od)w'=CH$WEZu/M^aR<,.n|1uAe,;MyNLKoel>F;-j[`L!>m:Y%/R}m&4&xuIM R%7Ez?vbd*Ns>VE;{\(yl|mGByV{D:Dm>'52].@P&t_s^,.d grep nnmail-cache-insert *.el | grep -v defun nnbabyl.el: (nnmail-cache-insert (nnmail-fetch-field "message-id") group)) nnbabyl.el: (nnmail-cache-insert (nnmail-fetch-field "message-id") group)) nndiary.el: (nnmail-cache-insert (nnmail-fetch-field "message-id") group)) nnfolder.el: (nnmail-cache-insert (nnmail-fetch-field "message-id") group)) nnimap.el: (nnmail-cache-insert (nnmail-fetch-field nnimap.el: (nnmail-cache-insert (nnmail-fetch-field "message-id") nnmail.el: (nnmail-cache-insert message-id (caar group-art))) nnmbox.el: (nnmail-cache-insert (nnmail-fetch-field "message-id") group)) nnmh.el: (nnmail-cache-insert (nnmail-fetch-field "message-id") group)) nnml.el: (nnmail-cache-insert (nnmail-fetch-field "message-id") group)) How does the following diff look? Index: lisp/nnbabyl.el =================================================================== RCS file: /usr/local/cvsroot/gnus/lisp/nnbabyl.el,v retrieving revision 6.8 diff -u -b -r6.8 nnbabyl.el --- lisp/nnbabyl.el 2002/02/20 00:15:32 6.8 +++ lisp/nnbabyl.el 2002/05/13 20:36:01 @@ -349,7 +349,7 @@ (while (re-search-backward "^X-Gnus-Newsgroup: " beg t) (delete-region (point) (progn (forward-line 1) (point))))) (when nnmail-cache-accepted-message-ids - (nnmail-cache-insert (nnmail-fetch-field "message-id"))) + (nnmail-cache-insert (nnmail-fetch-field "message-id") group)) (setq result (if (stringp group) (list (cons group (nnbabyl-active-number group))) @@ -365,7 +365,7 @@ (insert-buffer-substring buf) (when last (when nnmail-cache-accepted-message-ids - (nnmail-cache-insert (nnmail-fetch-field "message-id"))) + (nnmail-cache-insert (nnmail-fetch-field "message-id") group)) (save-buffer) (nnmail-save-active nnbabyl-group-alist nnbabyl-active-file)) result)))) Index: lisp/nndiary.el =================================================================== RCS file: /usr/local/cvsroot/gnus/lisp/nndiary.el,v retrieving revision 1.5 diff -u -b -r1.5 nndiary.el --- lisp/nndiary.el 2001/11/06 15:06:21 1.5 +++ lisp/nndiary.el 2002/05/13 20:36:01 @@ -759,7 +759,7 @@ (when (nndiary-schedule) (let (result) (when nnmail-cache-accepted-message-ids - (nnmail-cache-insert (nnmail-fetch-field "message-id"))) + (nnmail-cache-insert (nnmail-fetch-field "message-id") group)) (if (stringp group) (and (nnmail-activate 'nndiary) Index: lisp/nnfolder.el =================================================================== RCS file: /usr/local/cvsroot/gnus/lisp/nnfolder.el,v retrieving revision 6.40 diff -u -b -r6.40 nnfolder.el --- lisp/nnfolder.el 2002/05/01 00:26:33 6.40 +++ lisp/nnfolder.el 2002/05/13 20:36:01 @@ -489,7 +489,7 @@ (while (re-search-backward (concat "^" nnfolder-article-marker) nil t) (delete-region (point) (progn (forward-line 1) (point)))) (when nnmail-cache-accepted-message-ids - (nnmail-cache-insert (nnmail-fetch-field "message-id"))) + (nnmail-cache-insert (nnmail-fetch-field "message-id") group)) (setq result (if (stringp group) (list (cons group (nnfolder-active-number group))) (setq art-group Index: lisp/nnimap.el =================================================================== RCS file: /usr/local/cvsroot/gnus/lisp/nnimap.el,v retrieving revision 6.32 diff -u -b -r6.32 nnimap.el --- lisp/nnimap.el 2002/05/01 20:25:59 6.32 +++ lisp/nnimap.el 2002/05/13 20:36:02 @@ -1381,7 +1381,8 @@ (while (search-forward "\n" nil t) (replace-match "\r\n")) (when nnmail-cache-accepted-message-ids - (nnmail-cache-insert (nnmail-fetch-field "message-id")))) + (nnmail-cache-insert (nnmail-fetch-field "message-id") + group))) (when (and last nnmail-cache-accepted-message-ids) (nnmail-cache-close)) ;; this 'or' is for Cyrus server bug Index: lisp/nnmail.el =================================================================== RCS file: /usr/local/cvsroot/gnus/lisp/nnmail.el,v retrieving revision 6.40 diff -u -b -r6.40 nnmail.el --- lisp/nnmail.el 2002/05/07 15:32:17 6.40 +++ lisp/nnmail.el 2002/05/13 20:36:02 @@ -1466,27 +1466,28 @@ ;; which has an argument GROUP-ART which is a list of pairs, and ;; the car of a pair is a group name. Should we check that the ;; length of the list is equal to 1? -- kai - (let ((g nil)) - (cond (grp - (setq g grp)) - ((and (boundp 'group-art) group-art (listp group-art)) - (setq g (caar group-art))) - ((and (boundp 'group) group) - (setq g group)) - ((and (boundp 'group-art-list) group-art-list - (listp group-art-list)) - (setq g (caar group-art-list))) - (t (setq g ""))) +; (let ((g nil)) +; (cond (grp +; (setq g grp)) +; ((and (boundp 'group-art) group-art (listp group-art)) +; (setq g (caar group-art))) +; ((and (boundp 'group) group) +; (setq g group)) +; ((and (boundp 'group-art-list) group-art-list +; (listp group-art-list)) +; (setq g (caar group-art-list))) +; (t (setq g ""))) (unless (gnus-buffer-live-p nnmail-cache-buffer) (nnmail-cache-open)) (save-excursion (set-buffer nnmail-cache-buffer) (goto-char (point-max)) - (if (and g (not (string= "" g)) + (if (and grp (not (string= "" grp)) (gnus-methods-equal-p gnus-command-method (nnmail-cache-primary-mail-backend))) - (insert id "\t" g "\n") - (insert id "\n")))))) + (insert id "\t" grp "\n") + (insert id "\n"))))) +; ) (defun nnmail-cache-primary-mail-backend () (let ((be-list (cons gnus-select-method gnus-secondary-select-methods)) @@ -1588,7 +1589,7 @@ ((not duplication) (funcall func (setq group-art (nreverse (nnmail-article-group artnum-func)))) - (nnmail-cache-insert message-id)) + (nnmail-cache-insert message-id (caar group-art))) ((eq action 'delete) (setq group-art nil)) ((eq action 'warn) Index: lisp/nnmbox.el =================================================================== RCS file: /usr/local/cvsroot/gnus/lisp/nnmbox.el,v retrieving revision 6.13 diff -u -b -r6.13 nnmbox.el --- lisp/nnmbox.el 2002/04/12 11:51:01 6.13 +++ lisp/nnmbox.el 2002/05/13 20:36:02 @@ -332,7 +332,7 @@ (while (re-search-backward "^X-Gnus-Newsgroup: " nil t) (delete-region (point) (progn (forward-line 1) (point)))) (when nnmail-cache-accepted-message-ids - (nnmail-cache-insert (nnmail-fetch-field "message-id"))) + (nnmail-cache-insert (nnmail-fetch-field "message-id") group)) (setq result (if (stringp group) (list (cons group (nnmbox-active-number group))) (nnmail-article-group 'nnmbox-active-number))) Index: lisp/nnmh.el =================================================================== RCS file: /usr/local/cvsroot/gnus/lisp/nnmh.el,v retrieving revision 6.8 diff -u -b -r6.8 nnmh.el --- lisp/nnmh.el 2002/02/20 00:15:32 6.8 +++ lisp/nnmh.el 2002/05/13 20:36:02 @@ -316,7 +316,7 @@ (nnmh-possibly-change-directory group server) (nnmail-check-syntax) (when nnmail-cache-accepted-message-ids - (nnmail-cache-insert (nnmail-fetch-field "message-id"))) + (nnmail-cache-insert (nnmail-fetch-field "message-id") group)) (nnheader-init-server-buffer) (prog1 (if (stringp group) -- Josh Huber