* etc/icons/wl-draft-save-and-exit-up.xpm: Modified.

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

diff --git a/elmo/elmo-nmz.el b/elmo/elmo-nmz.el
index 1d74132..269e2a8 100644 (file)
--- a/elmo/elmo-nmz.el
+++ b/elmo/elmo-nmz.el
@@ -48,7 +48,7 @@ If the value is a list, all elements are used as index paths for namazu."
   :type 'symbol
   :group 'elmo)
 
-(defcustom elmo-nmz-args '("--all" "--list" "--early")
+(defcustom elmo-nmz-args '("--all" "--list" "--late")
   "*Argument list for namazu to list matched files."
   :type '(repeat string)
   :group 'elmo)
@@ -100,7 +100,7 @@ If the value is a list, all elements are used as index paths for namazu."
 
 (defun elmo-nmz-msgdb-create-entity (folder number)
   "Create msgdb entity for the message in the FOLDER with NUMBER."
-  (let ((location (elmo-map-message-location folder number))
+  (let ((location (expand-file-name (elmo-map-message-location folder number)))
        entity uid)
     (setq entity (elmo-msgdb-create-overview-entity-from-file number location))
     (unless (or (> (length (elmo-msgdb-overview-entity-get-to entity)) 0)
@@ -194,14 +194,14 @@ If the value is a list, all elements are used as index paths for namazu."
                                            &optional section unseen)
   (when (file-exists-p location)
     (prog1
-       (insert-file-contents-as-binary location)
+       (insert-file-contents-as-binary (expand-file-name location))
       (unless (or (std11-field-body "To")
                  (std11-field-body "Cc")
                  (std11-field-body "Subject"))
        (let (charset guess uid)
          (erase-buffer)
          (set-buffer-multibyte t)
-         (insert-file-contents location)
+         (insert-file-contents (expand-file-name location))
          (setq charset (detect-mime-charset-region (point-min)
                                                    (point-max)))
          (goto-char (point-min))
@@ -249,34 +249,11 @@ If the value is a list, all elements are used as index paths for namazu."
        (end-of-line)
        (setq locations (cons (buffer-substring bol (point)) locations))
        (forward-line 1))
-      locations)))
+      (nreverse locations))))
 
 (luna-define-method elmo-folder-exists-p ((folder elmo-nmz-folder))
   t)
 
-(luna-define-method elmo-folder-search ((folder elmo-nmz-folder)
-                                       condition &optional from-msgs)
-  (let* ((msgs (or from-msgs (elmo-folder-list-messages folder)))
-        (orig msgs)
-        (i 0)
-        case-fold-search matches
-        percent num
-        (num (length msgs)))
-    (while msgs
-      (if (elmo-file-field-condition-match
-          (elmo-map-message-location folder (car msgs))
-          condition
-          (car msgs)
-          orig)
-         (setq matches (cons (car msgs) matches)))
-       (setq i (1+ i))
-       (setq percent (/ (* i 100) num))
-       (elmo-display-progress
-       'elmo-nmz-search "Searching..."
-       percent)
-       (setq msgs (cdr msgs)))
-    matches))
-
 ;;; To override elmo-map-folder methods.
 (luna-define-method elmo-folder-list-unreads-internal
   ((folder elmo-nmz-folder) unread-marks &optional mark-alist)