Synch up with main trunk, and prepare the release 2.12.0.

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

diff --git a/wl/wl-score.el b/wl/wl-score.el
index f1ea581..f17e36b 100644 (file)
--- a/wl/wl-score.el
+++ b/wl/wl-score.el
@@ -558,7 +558,7 @@ Set `wl-score-cache' nil."
       (make-local-variable 'wl-score-alike-hashtb)
       (setq wl-score-alike-hashtb (elmo-make-hash (* (length messages) 2)))
       (when mime-decode
-       (elmo-set-buffer-multibyte default-enable-multibyte-characters))
+       (set-buffer-multibyte default-enable-multibyte-characters))
       (let (art last this alike)
        (while (setq art (pop messages))
          (setq this (wl-score-ov-entity-get (car art)
@@ -1195,7 +1195,7 @@ Set `wl-score-cache' nil."
              ((and wl-summary-important-above
                    (> score wl-summary-important-above))
               (if (wl-thread-jump-to-msg num);; force open
-                  (wl-summary-mark-as-important num)))
+                  (wl-summary-set-persistent-mark 'important num)))
              ((and wl-summary-target-above
                    (> score wl-summary-target-above))
               (if visible
@@ -1208,8 +1208,8 @@ Set `wl-score-cache' nil."
           (/ (* i 100) count))))
       (when dels
        (dolist (del dels)
-         (elmo-message-set-flag wl-summary-buffer-elmo-folder
-                                del 'read))
+         (elmo-message-unset-flag wl-summary-buffer-elmo-folder
+                                  del 'unread))
        (elmo-folder-kill-messages wl-summary-buffer-elmo-folder dels)
        (wl-summary-delete-messages-on-buffer dels))
       (when (and update update-unread)
@@ -1217,9 +1217,10 @@ Set `wl-score-cache' nil."
        (wl-folder-set-folder-updated (wl-summary-buffer-folder-name)
                                      (list
                                       0
-                                      (let ((lst
+                                      (let ((flag-count
                                              (wl-summary-count-unread)))
-                                        (+ (car lst) (nth 1 lst)))
+                                        (or (cdr (assq 'unread flag-count))
+                                            0))
                                       (elmo-folder-length
                                        wl-summary-buffer-elmo-folder)))
        (wl-summary-update-modeline))