Changed codename to Venus-pre2.

[elisp/wanderlust.git] / elmo / elmo-map.el

diff --git a/elmo/elmo-map.el b/elmo/elmo-map.el
index fee7c2c..cb13519 100644 (file)
--- a/elmo/elmo-map.el
+++ b/elmo/elmo-map.el
@@ -74,12 +74,6 @@
 (luna-define-generic elmo-map-folder-mark-as-read (folder locations)
   "")
 
-(luna-define-generic elmo-map-folder-unmark-answered (folder locations)
-  "")
-
-(luna-define-generic elmo-map-folder-mark-as-answered (folder locations)
-  "")
-
 (luna-define-generic elmo-map-message-fetch (folder location
                                                    strategy
                                                    &optional
@@ -90,21 +84,12 @@
 (luna-define-generic elmo-map-folder-list-unreads (folder)
   "")
 
-(luna-define-method elmo-map-folder-list-unreads ((folder elmo-map-folder))
-  t)
-
 (luna-define-generic elmo-map-folder-list-importants (folder)
   "")
 
 (luna-define-method elmo-map-folder-list-importants ((folder elmo-map-folder))
   t)
 
-(luna-define-generic elmo-map-folder-list-answereds (folder)
-  "")
-
-(luna-define-method elmo-map-folder-list-answereds ((folder elmo-map-folder))
-  t)
-
 (luna-define-generic elmo-map-folder-delete-messages (folder locations)
   "")
 
@@ -275,46 +260,26 @@
   ((folder elmo-map-folder) &optional nohide)
   (mapcar 'car (elmo-map-folder-location-alist-internal folder)))
 
-(luna-define-method elmo-folder-unmark-important :before ((folder
-                                                          elmo-map-folder)
-                                                         numbers)
+(luna-define-method elmo-folder-unmark-important ((folder elmo-map-folder)
+                                                 numbers)
   (elmo-map-folder-unmark-important
    folder
    (elmo-map-folder-numbers-to-locations folder numbers)))
 
-(luna-define-method elmo-folder-mark-as-important :before ((folder
-                                                           elmo-map-folder)
-                                                          numbers)
+(luna-define-method elmo-folder-mark-as-important ((folder elmo-map-folder)
+                                                  numbers)
   (elmo-map-folder-mark-as-important
    folder
    (elmo-map-folder-numbers-to-locations folder numbers)))
 
-(luna-define-method elmo-folder-unmark-read :before ((folder elmo-map-folder)
-                                                    numbers)
+(luna-define-method elmo-folder-unmark-read ((folder elmo-map-folder)
+                                            numbers)
   (elmo-map-folder-unmark-read
    folder
    (elmo-map-folder-numbers-to-locations folder numbers)))
 
-(luna-define-method elmo-folder-mark-as-read :before ((folder
-                                                      elmo-map-folder)
-                                                     numbers
-                                                     &optional ignore-flags)
-  (unless ignore-flags
-    (elmo-map-folder-mark-as-read
-     folder
-     (elmo-map-folder-numbers-to-locations folder numbers))))
-
-(luna-define-method elmo-folder-unmark-answered :before ((folder
-                                                         elmo-map-folder)
-                                                        numbers)
-  (elmo-map-folder-unmark-answered
-   folder
-   (elmo-map-folder-numbers-to-locations folder numbers)))
-
-(luna-define-method elmo-folder-mark-as-answered :before ((folder
-                                                         elmo-map-folder)
-                                                        numbers)
-  (elmo-map-folder-mark-as-answered
+(luna-define-method elmo-folder-mark-as-read ((folder elmo-map-folder) numbers)
+  (elmo-map-folder-mark-as-read
    folder
    (elmo-map-folder-numbers-to-locations folder numbers)))
 
@@ -326,25 +291,18 @@
    (elmo-map-message-location folder number)
    strategy section unread))
 
-(luna-define-method elmo-folder-list-unreads :around ((folder elmo-map-folder))
-  (let ((locations (elmo-map-folder-list-unreads folder)))
-    (if (listp locations)
-       (elmo-map-folder-locations-to-numbers folder locations)
-      (luna-call-next-method))))
+(luna-define-method elmo-folder-list-unreads-internal
+  ((folder elmo-map-folder) unread-marks &optional mark-alist)
+  (elmo-map-folder-locations-to-numbers
+   folder
+   (elmo-map-folder-list-unreads folder)))
 
-(luna-define-method elmo-folder-list-importants :around ((folder
-                                                         elmo-map-folder))
+(luna-define-method elmo-folder-list-importants-internal
+  ((folder elmo-map-folder) important-mark)
   (let ((locations (elmo-map-folder-list-importants folder)))
     (if (listp locations)
        (elmo-map-folder-locations-to-numbers folder locations)
-      (luna-call-next-method))))
-
-(luna-define-method elmo-folder-list-answereds :around ((folder
-                                                        elmo-map-folder))
-  (let ((locations (elmo-map-folder-list-answereds folder)))
-    (if (listp locations)
-       (elmo-map-folder-locations-to-numbers folder locations)
-      (luna-call-next-method))))
+      t)))
 
 (luna-define-method elmo-folder-delete-messages ((folder elmo-map-folder)
                                                 numbers)
@@ -360,6 +318,7 @@
             folder))
           (elmo-map-folder-location-alist-internal folder))))
   t) ; success
+  
 
 (require 'product)
 (product-provide (provide 'elmo-map) (require 'elmo-version))