Revert last commit (I'm sorry it was my mistake).

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

diff --git a/wl/wl-highlight.el b/wl/wl-highlight.el
index 9cbfd21..4391cf5 100644 (file)
--- a/wl/wl-highlight.el
+++ b/wl/wl-highlight.el
@@ -777,14 +777,14 @@
 (defun wl-highlight-summary-line-string (line mark temp-mark indent)
   (let (fsymbol)
     (cond ((and (string= temp-mark "+")
-               (member mark (list elmo-msgdb-unread-cached-mark
-                                  elmo-msgdb-unread-uncached-mark
-                                  elmo-msgdb-new-mark)))
+               (member mark (list wl-summary-unread-cached-mark
+                                  wl-summary-unread-uncached-mark
+                                  wl-summary-new-mark)))
           (setq fsymbol 'wl-highlight-summary-high-unread-face))
          ((and (string= temp-mark "-")
-               (member mark (list elmo-msgdb-unread-cached-mark
-                                  elmo-msgdb-unread-uncached-mark
-                                  elmo-msgdb-new-mark)))
+               (member mark (list wl-summary-unread-cached-mark
+                                  wl-summary-unread-uncached-mark
+                                  wl-summary-new-mark)))
           (setq fsymbol 'wl-highlight-summary-low-unread-face))
          ((string= temp-mark "o")
           (setq fsymbol 'wl-highlight-summary-refiled-face))
@@ -794,12 +794,12 @@
           (setq fsymbol 'wl-highlight-summary-deleted-face))
          ((string= temp-mark "*")
           (setq fsymbol 'wl-highlight-summary-temp-face))
-         ((string= mark elmo-msgdb-new-mark)
+         ((string= mark wl-summary-new-mark)
           (setq fsymbol 'wl-highlight-summary-new-face))
-         ((member mark (list elmo-msgdb-unread-cached-mark
-                             elmo-msgdb-unread-uncached-mark))
+         ((member mark (list wl-summary-unread-cached-mark
+                             wl-summary-unread-uncached-mark))
           (setq fsymbol 'wl-highlight-summary-unread-face))
-         ((or (string= mark elmo-msgdb-important-mark))
+         ((or (string= mark wl-summary-important-mark))
           (setq fsymbol 'wl-highlight-summary-important-face))
          ((string= temp-mark "-")
           (setq fsymbol 'wl-highlight-summary-low-read-face))
@@ -842,21 +842,21 @@
       (if (not fsymbol)
          (cond
           ((and (string= temp-mark "+")
-                (member status-mark (list elmo-msgdb-unread-cached-mark
-                                          elmo-msgdb-unread-uncached-mark
-                                          elmo-msgdb-new-mark)))
+                (member status-mark (list wl-summary-unread-cached-mark
+                                          wl-summary-unread-uncached-mark
+                                          wl-summary-new-mark)))
            (setq fsymbol 'wl-highlight-summary-high-unread-face))
           ((and (string= temp-mark "-")
-                (member status-mark (list elmo-msgdb-unread-cached-mark
-                                          elmo-msgdb-unread-uncached-mark
-                                          elmo-msgdb-new-mark)))
+                (member status-mark (list wl-summary-unread-cached-mark
+                                          wl-summary-unread-uncached-mark
+                                          wl-summary-new-mark)))
            (setq fsymbol 'wl-highlight-summary-low-unread-face))
-          ((string= status-mark elmo-msgdb-new-mark)
+          ((string= status-mark wl-summary-new-mark)
            (setq fsymbol 'wl-highlight-summary-new-face))
-          ((member status-mark (list elmo-msgdb-unread-cached-mark
-                                     elmo-msgdb-unread-uncached-mark))
+          ((member status-mark (list wl-summary-unread-cached-mark
+                                     wl-summary-unread-uncached-mark))
            (setq fsymbol 'wl-highlight-summary-unread-face))
-          ((string= status-mark elmo-msgdb-important-mark)
+          ((string= status-mark wl-summary-important-mark)
            (setq fsymbol 'wl-highlight-summary-important-face))
           ;; score mark
           ((string= temp-mark "-")