From 329d3842e99a868983212d72aab16c9d6e2ba9dd Mon Sep 17 00:00:00 2001 From: yamaoka Date: Mon, 22 Apr 2002 06:08:14 +0000 Subject: [PATCH] Synch with Oort Gnus. --- lisp/ChangeLog | 6 ++++++ lisp/nnmaildir.el | 23 ++++++++++++----------- 2 files changed, 18 insertions(+), 11 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 661855e..617fefa 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,9 @@ +2002-04-22 Paul Jarc + + * nnmaildir.el (nnmaildir-request-scan): typo: set + nnmaildir-get-new-mail, not nnmaildir-new-mail. Don't call + nnmail-get-new-mail for 'find-new-groups. + 2002-04-21 Paul Jarc * nnmaildir.el (nnmaildir-request-update-info, diff --git a/lisp/nnmaildir.el b/lisp/nnmaildir.el index 8e323a4..2c01d2b 100644 --- a/lisp/nnmaildir.el +++ b/lisp/nnmaildir.el @@ -702,7 +702,7 @@ by nnmaildir-request-article.") (let ((coding-system-for-write nnheader-file-coding-system) (buffer-file-coding-system nil) (file-coding-system-alist nil) - (nnmaildir-new-mail t) + (nnmaildir-get-new-mail t) (nnmaildir-group-alist nil) (nnmaildir-active-file nil) x srv-ls srv-dir method groups group dirs grp-dir seen deactivate-mark) @@ -718,20 +718,20 @@ by nnmaildir-request-article.") (if (nnmaildir--srv-gnm nnmaildir--cur-server) (nnmail-get-new-mail 'nnmaildir nil nil scan-group)) (unintern scan-group groups)) - (setq x (nth 5 (file-attributes srv-dir))) + (setq x (nth 5 (file-attributes srv-dir)) + scan-group (null scan-group)) (if (equal x (nnmaildir--srv-mtime nnmaildir--cur-server)) - (if scan-group nil - (mapatoms (lambda (sym) - (nnmaildir--scan (symbol-name sym) t groups - method srv-dir srv-ls)) - groups)) + (if scan-group + (mapatoms (lambda (sym) + (nnmaildir--scan (symbol-name sym) t groups + method srv-dir srv-ls)) + groups)) (setq dirs (funcall srv-ls srv-dir nil "\\`[^.]" 'nosort) x (length dirs) seen 1) (while (<= seen x) (setq seen (* 2 seen))) (if (/= seen 1) (setq seen (1- seen))) - (setq seen (make-vector seen 0) - scan-group (null scan-group)) + (setq seen (make-vector seen 0)) (while dirs (setq grp-dir (car dirs) dirs (cdr dirs)) (if (nnmaildir--scan grp-dir scan-group groups method srv-dir @@ -748,8 +748,9 @@ by nnmaildir-request-article.") (setq x (cdr x))) (setf (nnmaildir--srv-mtime nnmaildir--cur-server) (nth 5 (file-attributes srv-dir)))) - (if (nnmaildir--srv-gnm nnmaildir--cur-server) - (nnmail-get-new-mail 'nnmaildir nil nil)))))) + (and scan-group + (nnmaildir--srv-gnm nnmaildir--cur-server) + (nnmail-get-new-mail 'nnmaildir nil nil)))))) t) (defun nnmaildir-request-list (&optional server) -- 1.7.10.4