From 0e5efb8f0af32ab5f97c97256c464c80b59a7269 Mon Sep 17 00:00:00 2001
From: hmurata <hmurata>
Date: Sun, 23 Nov 2003 16:26:57 +0000
Subject: [PATCH] * elmo-multi.el (elmo-folder-newsgroups): Simplify.

* elmo-pipe.el (elmo-folder-get-primitive-list): Likewise.

* elmo-filter.el (elmo-folder-get-primitive-list): Fixed.
---
 elmo/ChangeLog      |    8 ++++++++
 elmo/elmo-filter.el |    2 +-
 elmo/elmo-multi.el  |   12 ++++--------
 elmo/elmo-pipe.el   |    8 +++-----
 4 files changed, 16 insertions(+), 14 deletions(-)

diff --git a/elmo/ChangeLog b/elmo/ChangeLog
index 81891c3..dd241e5 100644
--- a/elmo/ChangeLog
+++ b/elmo/ChangeLog
@@ -1,3 +1,11 @@
+2003-11-23  Hiroya Murata  <lapis-lazuli@pop06.odn.ne.jp>
+
+	* elmo-multi.el (elmo-folder-newsgroups): Simplify.
+
+	* elmo-pipe.el (elmo-folder-get-primitive-list): Likewise.
+
+	* elmo-filter.el (elmo-folder-get-primitive-list): Fixed.
+
 2003-11-22  Hiroya Murata  <lapis-lazuli@pop06.odn.ne.jp>
 
 	* elmo-version.el (elmo-version): Up to 2.11.22.
diff --git a/elmo/elmo-filter.el b/elmo/elmo-filter.el
index 575b804..2e0e7ec 100644
--- a/elmo/elmo-filter.el
+++ b/elmo/elmo-filter.el
@@ -106,7 +106,7 @@
 
 (luna-define-method elmo-folder-get-primitive-list ((folder
 						     elmo-filter-folder))
-  (list (elmo-filter-folder-target-internal folder)))
+  (elmo-folder-get-primitive-list (elmo-filter-folder-target-internal folder)))
 
 (luna-define-method elmo-folder-contains-type ((folder elmo-filter-folder)
 					       type)
diff --git a/elmo/elmo-multi.el b/elmo/elmo-multi.el
index 314bc49..8911469 100644
--- a/elmo/elmo-multi.el
+++ b/elmo/elmo-multi.el
@@ -101,14 +101,10 @@
 				      elmo-msgdb-directory)))
 
 (luna-define-method elmo-folder-newsgroups ((folder elmo-multi-folder))
-  (delq nil
-	(elmo-flatten
-	 (mapcar
-	  'elmo-folder-newsgroups
-	  (elmo-flatten
-	   (mapcar
-	    'elmo-folder-get-primitive-list
-	    (elmo-multi-folder-children-internal folder)))))))
+  (apply  #'nconc
+	  (mapcar
+	   'elmo-folder-newsgroups
+	   (elmo-multi-folder-children-internal folder))))
 
 (luna-define-method elmo-folder-get-primitive-list ((folder elmo-multi-folder))
   (elmo-flatten
diff --git a/elmo/elmo-pipe.el b/elmo/elmo-pipe.el
index 44b46d3..fe6239e 100644
--- a/elmo/elmo-pipe.el
+++ b/elmo/elmo-pipe.el
@@ -55,11 +55,9 @@
   folder)
 
 (luna-define-method elmo-folder-get-primitive-list ((folder elmo-pipe-folder))
-  (elmo-flatten
-   (mapcar
-    'elmo-folder-get-primitive-list
-    (list (elmo-pipe-folder-src-internal folder)
-	  (elmo-pipe-folder-dst-internal folder)))))
+  (nconc
+   (elmo-folder-get-primitive-list (elmo-pipe-folder-src-internal folder))
+   (elmo-folder-get-primitive-list (elmo-pipe-folder-dst-internal folder))))
 
 (luna-define-method elmo-folder-contains-type ((folder elmo-pipe-folder)
 					       type)
-- 
1.7.10.4