* elmo-map.el (elmo-folder-open-internal): Don't load location map if

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

diff --git a/elmo/elmo-multi.el b/elmo/elmo-multi.el
index 880310c..2e52de3 100644 (file)
--- a/elmo/elmo-multi.el
+++ b/elmo/elmo-multi.el
@@ -45,12 +45,12 @@
 
 (defmacro elmo-multi-real-folder-number (folder number)
   "Returns a cons cell of real FOLDER and NUMBER."
-  (` (cons (nth (-
-                (/ (, number)
-                   (elmo-multi-folder-divide-number-internal (, folder)))
-                1) (elmo-multi-folder-children-internal (, folder)))
-          (% (, number) (elmo-multi-folder-divide-number-internal
-                         (, folder))))))
+  `(cons (nth (-
+              (/ ,number
+                 (elmo-multi-folder-divide-number-internal ,folder))
+              1) (elmo-multi-folder-children-internal ,folder))
+        (% ,number (elmo-multi-folder-divide-number-internal
+                    ,folder))))
 
 (luna-define-method elmo-folder-initialize ((folder
                                             elmo-multi-folder)
@@ -353,11 +353,10 @@
            (nconc
             numbers
             (mapcar
-             (function
-              (lambda (x)
-                (+
-                 (* (elmo-multi-folder-divide-number-internal
-                     folder) cur-number) x)))
+             (lambda (x)
+               (+
+                (* (elmo-multi-folder-divide-number-internal
+                    folder) cur-number) x))
              list)))
       (setq flds (cdr flds)))
     numbers))
@@ -405,13 +404,12 @@
       (setq cur-number (+ cur-number 1))
       (setq matches (append matches
                            (mapcar
-                            (function
-                             (lambda (x)
-                               (+
-                                (* (elmo-multi-folder-divide-number-internal
-                                    folder)
-                                   cur-number)
-                                x)))
+                            (lambda (x)
+                              (+
+                               (* (elmo-multi-folder-divide-number-internal
+                                   folder)
+                                  cur-number)
+                               x))
                             (elmo-folder-search
                              (car flds) condition))))
       (setq flds (cdr flds)))
@@ -497,11 +495,10 @@
            (nconc
             numbers
             (mapcar
-             (function
-              (lambda (x)
-                (+
-                 (* (elmo-multi-folder-divide-number-internal folder)
-                    cur-number) x)))
+             (lambda (x)
+               (+
+                (* (elmo-multi-folder-divide-number-internal folder)
+                   cur-number) x))
              (elmo-folder-list-flagged child flag in-msgdb)))))
     numbers))