From 520aaf660f2053b94632fcc904deb3843c3c35ad Mon Sep 17 00:00:00 2001
From: teranisi <teranisi>
Date: Tue, 6 Aug 2002 12:03:06 +0000
Subject: [PATCH] * elmo-vars.el (elmo-imap4-default-mailbox): Abolished.

* elmo-util.el (elmo-warning): Ignore errors while recenter.

* elmo-msgdb.el (elmo-msgdb-do-each-entity): New macro.

* elmo-imap4.el (elmo-folder-initialize): Don't use
elmo-imap4-default-mailbox.
---
 elmo/ChangeLog     |   11 +++++++++++
 elmo/elmo-imap4.el |    4 +---
 elmo/elmo-msgdb.el |    7 +++++++
 elmo/elmo-util.el  |    4 ++--
 elmo/elmo-vars.el  |    6 ------
 5 files changed, 21 insertions(+), 11 deletions(-)

diff --git a/elmo/ChangeLog b/elmo/ChangeLog
index d83f5e7..e03c324 100644
--- a/elmo/ChangeLog
+++ b/elmo/ChangeLog
@@ -1,3 +1,14 @@
+2002-08-06  Yuuichi Teranishi  <teranisi@gohome.org>
+
+	* elmo-vars.el (elmo-imap4-default-mailbox): Abolished.
+
+	* elmo-util.el (elmo-warning): Ignore errors while recenter.
+
+	* elmo-msgdb.el (elmo-msgdb-do-each-entity): New macro.
+
+	* elmo-imap4.el (elmo-folder-initialize): Don't use
+	elmo-imap4-default-mailbox.
+
 2002-07-24  TAKAHASHI Kaoru  <kaoru@kaisei.org>
 
 	* elmo-split.el (toplevel): Use `product-provide'.
diff --git a/elmo/elmo-imap4.el b/elmo/elmo-imap4.el
index 01a0683..c980327 100644
--- a/elmo/elmo-imap4.el
+++ b/elmo/elmo-imap4.el
@@ -1787,9 +1787,7 @@ Return nil if no complete line has arrived."
     (setq parse (elmo-parse-token name ":"))
     (elmo-imap4-folder-set-mailbox-internal folder
 					    (elmo-imap4-encode-folder-string
-					     (if (eq (length (car parse)) 0)
-						 elmo-imap4-default-mailbox
-					       (car parse))))
+					     (car parse)))
     ;; user
     (setq parse (elmo-parse-prefixed-element ?: (cdr parse) "/"))
     (elmo-net-folder-set-user-internal folder
diff --git a/elmo/elmo-msgdb.el b/elmo/elmo-msgdb.el
index 04ac69a..6eda5f8 100644
--- a/elmo/elmo-msgdb.el
+++ b/elmo/elmo-msgdb.el
@@ -951,6 +951,13 @@ Return the updated INDEX."
     elmo-msgdb-location-filename
     dir) alist))
 
+(put 'elmo-msgdb-do-each-entity 'lisp-indent-function '1)
+(def-edebug-spec elmo-msgdb-do-each-entity
+  ((symbolp form &rest form) &rest form))
+(defmacro elmo-msgdb-do-each-entity (spec &rest form)
+  `(dolist (,(car spec) (elmo-msgdb-get-overview ,(car (cdr spec))))
+     ,@form))
+
 (require 'product)
 (product-provide (provide 'elmo-msgdb) (require 'elmo-version))
 
diff --git a/elmo/elmo-util.el b/elmo/elmo-util.el
index 86217c3..5554f33 100644
--- a/elmo/elmo-util.el
+++ b/elmo/elmo-util.el
@@ -1883,8 +1883,8 @@ If KBYTES is kilo bytes (This value must be float)."
   (with-current-buffer (get-buffer-create elmo-warning-buffer-name)
     (goto-char (point-max))
     (apply 'insert (append args '("\n")))
-    (recenter 1))
-  (display-buffer elmo-warning-buffer-name))
+    (ignore-errors (recenter 1))
+    (display-buffer elmo-warning-buffer-name)))
 
 (defvar elmo-obsolete-variable-alist nil)
 
diff --git a/elmo/elmo-vars.el b/elmo/elmo-vars.el
index 36d70d1..39601f5 100644
--- a/elmo/elmo-vars.el
+++ b/elmo/elmo-vars.el
@@ -88,12 +88,6 @@
 
 ;;; IMAP4
 
-(defcustom elmo-imap4-default-mailbox "inbox"
-  "*Default IMAP4 mailbox."
-  :type 'string
-  :group 'elmo
-  :group 'elmo-setting)
-
 (defcustom elmo-imap4-default-server "localhost"
   "*Default IMAP4 server."
   :type 'string
-- 
1.7.10.4