* wl-util.el (wl-biff-check-folders): Ignore non-existent folder.

(wl-biff-check-folder-async): Ditto.
* wl-vars.el (wl-biff-check-folder-list): Fix tag.

diff --git a/wl/ChangeLog b/wl/ChangeLog
index 3609ed3..c748840 100644 (file)
--- a/wl/ChangeLog
+++ b/wl/ChangeLog
@@ -1,3 +1,9 @@
+2004-09-11  Yoichi NAKAYAMA  <yoichi@geiin.org>
+
+       * wl-util.el (wl-biff-check-folders): Ignore non-existent folder.
+       (wl-biff-check-folder-async): Ditto.
+       * wl-vars.el (wl-biff-check-folder-list): Fix tag.
+
 2004-09-08  Tetsurou Okazaki  <okazaki@be.to>
 
        * wl-summary.el (wl-summary-rescan): Implement reverse sorting.

diff --git a/wl/wl-util.el b/wl/wl-util.el
index c486788..4da1a9b 100644 (file)
--- a/wl/wl-util.el
+++ b/wl/wl-util.el
@@ -847,7 +847,8 @@ This function is imported from Emacs 20.7."
            (while flist
              (setq folder (wl-folder-get-elmo-folder (car flist))
                    flist (cdr flist))
-             (when (elmo-folder-plugged-p folder)
+             (when (and (elmo-folder-plugged-p folder)
+                        (elmo-folder-exists-p folder))
                (setq new-mails
                      (+ new-mails
                         (nth 0 (wl-biff-check-folder folder))))))
@@ -877,23 +878,26 @@ This function is imported from Emacs 20.7."
   (wl-biff-notify (car diff) (nth 2 data)))
 
 (defun wl-biff-check-folder-async (folder notify-minibuf)
-  (when (elmo-folder-plugged-p folder)
-    (elmo-folder-set-biff-internal folder t)
-    (if (and (eq (elmo-folder-type-internal folder) 'imap4)
-            (elmo-folder-use-flag-p folder))
-       ;; Check asynchronously only when IMAP4 and use server diff.
-       (progn
-         (setq elmo-folder-diff-async-callback
-               'wl-biff-check-folder-async-callback)
-         (setq elmo-folder-diff-async-callback-data
-               (list (elmo-folder-name-internal folder)
-                     (get-buffer wl-folder-buffer-name)
-                     notify-minibuf))
-         (elmo-folder-diff-async folder))
-      (unwind-protect
-         (wl-biff-notify (car (wl-biff-check-folder folder))
-                         notify-minibuf)
-       (setq wl-biff-check-folders-running nil)))))
+  (if (and (elmo-folder-plugged-p folder)
+          (elmo-folder-exists-p folder))
+      (progn
+       (elmo-folder-set-biff-internal folder t)
+       (if (and (eq (elmo-folder-type-internal folder) 'imap4)
+                (elmo-folder-use-flag-p folder))
+           ;; Check asynchronously only when IMAP4 and use server diff.
+           (progn
+             (setq elmo-folder-diff-async-callback
+                   'wl-biff-check-folder-async-callback)
+             (setq elmo-folder-diff-async-callback-data
+                   (list (elmo-folder-name-internal folder)
+                         (get-buffer wl-folder-buffer-name)
+                         notify-minibuf))
+             (elmo-folder-diff-async folder))
+         (unwind-protect
+             (wl-biff-notify (car (wl-biff-check-folder folder))
+                             notify-minibuf)
+           (setq wl-biff-check-folders-running nil))))
+    (setq wl-biff-check-folders-running nil)))
 
 (if (and (fboundp 'regexp-opt)
         (not (featurep 'xemacs)))

diff --git a/wl/wl-vars.el b/wl/wl-vars.el
index 83e7bcc..29a9051 100644 (file)
--- a/wl/wl-vars.el
+++ b/wl/wl-vars.el
@@ -2081,7 +2081,7 @@ Each elements are regexp of folder name."
 (defcustom wl-biff-check-folder-list nil
   "All folders that match this list are automatically checked
 every intervals specified by wl-biff-check-interval."
-  :type '(repeat (regexp :tag "Folder Regexp"))
+  :type '(repeat (regexp :tag "Folder"))
   :group 'wl-highlight)
 
 (defcustom wl-biff-check-interval 40