Fix last change (comment-style).

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

diff --git a/elmo/elmo.el b/elmo/elmo.el
index e52ae66..15c935e 100644 (file)
--- a/elmo/elmo.el
+++ b/elmo/elmo.el
@@ -161,7 +161,7 @@ If a folder name begins with PREFIX, use BACKEND."
 
 (defmacro elmo-folder-send (folder message &rest args)
   "Let FOLDER receive the MESSAGE with ARGS."
-  (` (luna-send (, folder) (, message) (, folder) (,@ args))))
+  `(luna-send ,folder ,message ,folder ,@args))
 
 ;;;###autoload
 (defun elmo-make-folder (name &optional non-persistent mime-charset)
@@ -808,10 +808,9 @@ Return a cons cell of (NUMBER-CROSSPOSTS . NEW-FLAG-ALIST).")
                                                         numbers))))
        (setq numbers results
              condition (nth 2 condition)))
-      (let ((len (length numbers))
-           matched)
-       (elmo-with-progress-display (> len elmo-display-progress-threshold)
-           (elmo-folder-search len "Searching...")
+      (let (matched)
+       (elmo-with-progress-display (elmo-folder-search (length numbers))
+           "Searching messages"
          (dolist (number numbers)
            (let (result)
              (setq result (elmo-msgdb-match-condition msgdb
@@ -826,7 +825,6 @@ Return a cons cell of (NUMBER-CROSSPOSTS . NEW-FLAG-ALIST).")
              (when result
                (setq matched (cons number matched))))
            (elmo-progress-notify 'elmo-folder-search)))
-       (message "Searching...done")
        (nreverse matched)))))
 
 (defun elmo-message-buffer-match-condition (condition number)
@@ -862,7 +860,7 @@ Return a cons cell of (NUMBER-CROSSPOSTS . NEW-FLAG-ALIST).")
     (when (and filename (file-readable-p filename))
       (with-temp-buffer
        (set-buffer-multibyte nil)
-       ;;(insert-file-contents-as-binary filename)
+;;;    (insert-file-contents-as-binary filename)
        (elmo-message-fetch folder number
                            (elmo-make-fetch-strategy 'entire
                                                      (and cache t)
@@ -956,7 +954,8 @@ If optional argument IF-EXISTS is nil, load on demand.
   (elmo-folder-set-info-hashtb
    folder
    (if numbers (apply #'max numbers) 0)
-   nil ;;(length num-db)
+;;;   (length num-db)
+   nil
    ))
 
 (defun elmo-folder-get-info-max (folder)
@@ -975,7 +974,7 @@ If optional argument IF-EXISTS is nil, load on demand.
   "Setup folder info hashtable by INFO-ALIST on HASHTB."
   (let* ((hashtb (or hashtb
                     (elmo-make-hash (length info-alist)))))
-    (mapcar
+    (mapc
      (lambda (x)
        (let ((info (cadr x)))
         (and (intern-soft (car x) hashtb)
@@ -1069,7 +1068,7 @@ If optional argument IF-EXISTS is nil, load on demand.
 (eval-and-compile
   (luna-define-class elmo-file-tag))
 
-(defconst elmo-append-messages-disptch-table
+(defconst elmo-append-messages-dispatch-table
   '(((nil      . null)         . elmo-folder-append-messages-*-null)
     ((filter   . nil)          . elmo-folder-append-messages-filter-*)
     ((nil      . filter)       . elmo-folder-append-messages-*-filter)
@@ -1113,9 +1112,9 @@ If second optional argument SAME-NUMBER is specified,
 message number is preserved \(if possible\).
 Returns a list of message numbers successfully appended."
   (let ((rest (if caller
-                 (cdr (memq (rassq caller elmo-append-messages-disptch-table)
-                            elmo-append-messages-disptch-table))
-               elmo-append-messages-disptch-table))
+                 (cdr (memq (rassq caller elmo-append-messages-dispatch-table)
+                            elmo-append-messages-dispatch-table))
+               elmo-append-messages-dispatch-table))
        result)
     (while rest
       (let ((types (car (car rest))))
@@ -1130,9 +1129,9 @@ Returns a list of message numbers successfully appended."
 (defun elmo-generic-folder-append-messages (folder src-folder numbers
                                                   same-number)
   (let ((src-msgdb-exists (not (zerop (elmo-folder-length src-folder))))
-       unseen table
+       unseen
        succeed-numbers failure cache id)
-    (setq table (elmo-folder-flag-table folder))
+    (elmo-folder-flag-table folder) ; load
     (with-temp-buffer
       (set-buffer-multibyte nil)
       (while numbers
@@ -1181,7 +1180,6 @@ Returns a list of message numbers successfully appended."
                                             same-number)
   (save-excursion
     (let* ((messages msgs)
-          (elmo-inhibit-display-retrieval-progress t)
           (len (length msgs))
           succeeds i result)
       (if (eq dst-folder 'null)
@@ -1212,7 +1210,7 @@ Returns a list of message numbers successfully appended."
            result)
        (if no-delete
            (progn
-             ;; (message "Copying messages...done")
+;;;          (message "Copying messages...done")
              t)
          (if (eq len 0)
              (message "No message was moved.")
@@ -1453,10 +1451,10 @@ If Optional LOCAL is non-nil, don't update server flag."
   ;; Do nothing.
   )
 
-;;(luna-define-generic elmo-folder-append-message-entity (folder entity
-;;                                                            &optional
-;;                                                            flag-table)
-;;  "Append ENTITY to the folder.")
+;;;(luna-define-generic elmo-folder-append-message-entity (folder entity
+;;;                                                           &optional
+;;;                                                           flag-table)
+;;;  "Append ENTITY to the folder.")
 
 (defun elmo-msgdb-merge (folder msgdb-merge)
   "Return a list of messages which have duplicated message-id."
@@ -1500,8 +1498,8 @@ If Optional LOCAL is non-nil, don't update server flag."
          (catch 'end
            (while t
              (setq in (read-from-minibuffer "Update number: "
-                                            (int-to-string in))
-                   in (string-to-int in))
+                                            (number-to-string in))
+                   in (string-to-number in))
              (if (< len in)
                  (throw 'end len))
              (if (y-or-n-p (format
@@ -1778,8 +1776,8 @@ Return a hashtable for newsgroups."
       (while alist
        (setq newsgroups
              (elmo-delete-if
-              '(lambda (x)
-                 (not (intern-soft x elmo-newsgroups-hashtb)))
+              (lambda (x)
+                (not (intern-soft x elmo-newsgroups-hashtb)))
               (nth 1 (car alist))))
        (if newsgroups
            (setcar (cdar alist) newsgroups)