From: hmurata <hmurata>
Date: Thu, 5 Apr 2001 11:13:23 +0000 (+0000)
Subject: * elmo.el (elmo-folder-list-messages-internal): Fixed lucking optional
X-Git-Tag: wl-2_6-root^3~58
X-Git-Url: http://git.chise.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4651eabc354fb3fca8c6d8882e74d6763c8a9ae5;p=elisp%2Fwanderlust.git

* elmo.el (elmo-folder-list-messages-internal): Fixed lucking optional
argument `visible-only'.
(elmo-generic-folder-append-messages): Fixed condition. Use `unless'
instead of `if'.

* elmo-pop3.el (elmo-folder-open-internal): Check
`elmo-inhibit-number-mapping' is non-nil.

* elmo-pipe.el (elmo-folder-status): Fixed.
---

diff --git a/elmo/ChangeLog b/elmo/ChangeLog
index aac185c..7e6a514 100644
--- a/elmo/ChangeLog
+++ b/elmo/ChangeLog
@@ -1,3 +1,15 @@
+2001-04-05  Hiroya Murata  <lapis-lazuli@pop06.odn.ne.jp>
+
+	* elmo.el (elmo-folder-list-messages-internal): Fixed lucking optional
+	argument `visible-only'.
+	(elmo-generic-folder-append-messages): Fixed condition. Use `unless'
+	instead of `if'.
+
+	* elmo-pop3.el (elmo-folder-open-internal): Check
+	`elmo-inhibit-number-mapping' is non-nil.
+
+	* elmo-pipe.el (elmo-folder-status): Fixed.
+
 2001-04-05  Yuuichi Teranishi  <teranisi@gohome.org>
 
 	* elmo.el (elmo-dop-queue-flush): Added autload setting.
diff --git a/elmo/elmo-pipe.el b/elmo/elmo-pipe.el
index 572d644..bf99778 100644
--- a/elmo/elmo-pipe.el
+++ b/elmo/elmo-pipe.el
@@ -138,10 +138,10 @@
 	 (dst-list (elmo-folder-list-messages
 		    (elmo-pipe-folder-dst-internal folder))))
     (prog1 (cons (+ src-length (elmo-max-of-list dst-list))
-		 (+ src-length (length dst-list)))))
-  ;; No save.
-  (elmo-folder-close-internal (elmo-pipe-folder-src-internal folder))
-  (elmo-folder-close-internal (elmo-pipe-folder-dst-internal folder)))
+		 (+ src-length (length dst-list)))
+      ;; No save.
+      (elmo-folder-close-internal (elmo-pipe-folder-src-internal folder))
+      (elmo-folder-close-internal (elmo-pipe-folder-dst-internal folder)))))
 
 (luna-define-method elmo-folder-exists-p ((folder elmo-pipe-folder))
   (and (elmo-folder-exists-p (elmo-pipe-folder-src-internal folder))
diff --git a/elmo/elmo-pop3.el b/elmo/elmo-pop3.el
index 7a415bf..e89bfbb 100644
--- a/elmo/elmo-pop3.el
+++ b/elmo/elmo-pop3.el
@@ -812,7 +812,8 @@ set as non-nil.")
 	(insert-buffer-substring (process-buffer process) start (- end 3))))))
 
 (luna-define-method elmo-folder-open-internal ((folder elmo-pop3-folder))
-  (if (elmo-pop3-folder-use-uidl-internal folder)
+  (if (and (not elmo-inhibit-number-mapping)
+	   (elmo-pop3-folder-use-uidl-internal folder))
       (elmo-pop3-folder-set-location-alist-internal
        folder (elmo-msgdb-location-load (elmo-folder-msgdb-path folder)))))
 
diff --git a/elmo/elmo.el b/elmo/elmo.el
index cf0ade5..c795cd7 100644
--- a/elmo/elmo.el
+++ b/elmo/elmo.el
@@ -483,7 +483,7 @@ Return newly created temporary directory name which contains temporary files.")
 	   (elmo-file-cache-path cache-file))))))
 
 (luna-define-method elmo-folder-list-messages-internal
-  ((folder elmo-folder))
+  ((folder elmo-folder) &optional visible-only)
   t)
 
 (luna-define-method elmo-folder-list-unreads-internal
@@ -817,11 +817,11 @@ Return a cons cell of (NUMBER-CROSSPOSTS . NEW-MARK-ALIST).")
 	  (error (setq failure t)))
 	;; FETCH & APPEND finished
 	(unless failure
-	  (if unseen (setq seen-list (cons
-				      (elmo-message-field
-				       src-folder (car numbers)
-				       'message-id)
-				      seen-list)))
+	  (unless unseen
+	    (setq seen-list (cons (elmo-message-field
+				   src-folder (car numbers)
+				   'message-id)
+				  seen-list)))
 	  (setq succeed-numbers (cons (car numbers) succeed-numbers)))
 	(setq numbers (cdr numbers)))
       (if (and seen-list (elmo-folder-persistent-p folder))