Prepare for 2.10.1.

[elisp/wanderlust.git] / wl / wl-expire.el

diff --git a/wl/wl-expire.el b/wl/wl-expire.el
index 5852fd5..165e07e 100644 (file)
--- a/wl/wl-expire.el
+++ b/wl/wl-expire.el
@@ -49,12 +49,12 @@
 (defun wl-expired-alist-load ()
   (elmo-object-load (expand-file-name
                     wl-expired-alist-file-name
-                    elmo-msgdb-dir)))
+                    elmo-msgdb-directory)))
 
 (defun wl-expired-alist-save (&optional alist)
   (elmo-object-save (expand-file-name
                     wl-expired-alist-file-name
-                    elmo-msgdb-dir)
+                    elmo-msgdb-directory)
                    (or alist wl-expired-alist)))
 
 (defsubst wl-expire-msg-p (msg-num mark-alist)
@@ -744,7 +744,7 @@ ex. +ml/wl/1999_11/, +ml/wl/1999_12/."
            (setq ret-val (wl-summary-expire folder (not update-msgdb)))
            (if update-msgdb
                (progn
-                 (wl-summary-save-view 'keep)
+                 (wl-summary-save-view)
                  (elmo-folder-commit wl-summary-buffer-elmo-folder))
              (if ret-val
                  (wl-folder-check-entity entity))))))))))
@@ -867,7 +867,7 @@ ex. +ml/wl/1999_11/, +ml/wl/1999_12/."
     (save-excursion
       (let ((tmp-buf (get-buffer-create " *wl-expire work*"))
            (filename (expand-file-name wl-expired-log-alist-file-name
-                                       elmo-msgdb-dir)))
+                                       elmo-msgdb-directory)))
        (set-buffer tmp-buf)
        (erase-buffer)
        (if dst-folder
@@ -880,7 +880,7 @@ ex. +ml/wl/1999_11/, +ml/wl/1999_12/."
        (if (file-writable-p filename)
            (write-region (point-min) (point-max)
                          filename t 'no-msg)
-         (message (format "%s is not writable." filename)))
+         (message "%s is not writable." filename))
        (kill-buffer tmp-buf)))))
 
 (require 'product)