* wl-vars.el (wl-summary-new-uncached-mark): Renamed from

wl-summary-new-mark.
(wl-summary-new-cached-mark): New user option.
(wl-summary-score-marks): Follow the change above.
(wl-summary-auto-refile-skip-marks): Ditto.
(wl-summary-incorporate-marks): Ditto.
(wl-summary-expire-reserve-marks): Ditto.

* wl-spam.el (wl-spam-auto-check-marks): Ditto.

* wl-summary.el (wl-summary-detect-mark-position): Ditto.
(wl-summary-persistent-mark-string): Distinguished between cached
and uncached mark when the message is new.

* elmo-msgdb.el (elmo-flag-table-get): Check cached if saved flags
is nil.

diff --git a/elmo/ChangeLog b/elmo/ChangeLog
index a51bf5d..9644834 100644 (file)
--- a/elmo/ChangeLog
+++ b/elmo/ChangeLog
@@ -1,3 +1,8 @@
+2003-11-05  Hiroya Murata  <lapis-lazuli@pop06.odn.ne.jp>
+
+       * elmo-msgdb.el (elmo-flag-table-get): Check cached if saved flags
+       is nil.
+
 2003-11-03  Hiroya Murata  <lapis-lazuli@pop06.odn.ne.jp>
 
        * elmo.el (elmo-folder-unflag-important): Call

diff --git a/elmo/elmo-msgdb.el b/elmo/elmo-msgdb.el
index 901eee7..6eddd2d 100644 (file)
--- a/elmo/elmo-msgdb.el
+++ b/elmo/elmo-msgdb.el
@@ -201,14 +201,14 @@ VALUE is the field value (raw)."
 
 (defun elmo-flag-table-get (flag-table msg-id)
   (let ((flags (elmo-get-hash-val msg-id flag-table)))
-    (if flags
-       (append
-        (and (elmo-file-cache-exists-p msg-id)
-             '(cached))
+    (append
+     (and (elmo-file-cache-exists-p msg-id)
+         '(cached))
+     (if flags
         (elmo-list-delete '(cached read)
                           (copy-sequence flags)
-                          #'delq))
-      '(new unread))))
+                          #'delq)
+       '(new unread)))))
 
 (defun elmo-flag-table-save (dir flag-table)
   (elmo-object-save

diff --git a/wl/ChangeLog b/wl/ChangeLog
index 7c7e1ff..c4e936d 100644 (file)
--- a/wl/ChangeLog
+++ b/wl/ChangeLog
@@ -1,3 +1,19 @@
+2003-11-05  Hiroya Murata  <lapis-lazuli@pop06.odn.ne.jp>
+
+       * wl-vars.el (wl-summary-new-uncached-mark): Renamed from
+       wl-summary-new-mark.
+       (wl-summary-new-cached-mark): New user option.
+       (wl-summary-score-marks): Follow the change above.
+       (wl-summary-auto-refile-skip-marks): Ditto.
+       (wl-summary-incorporate-marks): Ditto.
+       (wl-summary-expire-reserve-marks): Ditto.
+
+       * wl-spam.el (wl-spam-auto-check-marks): Ditto.
+
+       * wl-summary.el (wl-summary-detect-mark-position): Ditto.
+       (wl-summary-persistent-mark-string): Distinguished between cached
+       and uncached mark when the message is new.
+
 2003-11-02  Hiroya Murata  <lapis-lazuli@pop06.odn.ne.jp>
 
        * wl-spam.el (wl-spam-domain): Renamed from

diff --git a/wl/wl-spam.el b/wl/wl-spam.el
index 31cc3b0..3cabb9b 100644 (file)
--- a/wl/wl-spam.el
+++ b/wl/wl-spam.el
@@ -65,7 +65,8 @@
   :group 'wl-spam)
 
 (defcustom wl-spam-auto-check-marks
-  (list wl-summary-new-mark)
+  (list wl-summary-new-uncached-mark
+       wl-summary-new-cached-mark)
   "Persistent marks to check spam automatically."
   :type '(choice (const :tag "All marks" all)
                 (repeat (string :tag "Mark")))

diff --git a/wl/wl-summary.el b/wl/wl-summary.el
index fbd0084..594215a 100644 (file)
--- a/wl/wl-summary.el
+++ b/wl/wl-summary.el
@@ -703,7 +703,8 @@ you."
   (let ((column wl-summary-buffer-number-column)
        (formatter wl-summary-buffer-line-formatter)
        (dummy-temp (char-to-string 200))
-       (wl-summary-new-mark (char-to-string 201)) ; bind only for the check.
+       ;; bind only for the check.
+       (wl-summary-new-uncached-mark (char-to-string 201))
        (wl-summary-flag-priority-list '(new))     ; ditto.
        wl-summary-highlight
        temp persistent)
@@ -726,9 +727,10 @@ you."
       (setq temp (save-excursion
                   (when (search-forward dummy-temp nil t)
                     (current-column)))
-           persistent (save-excursion
-                        (when (search-forward wl-summary-new-mark nil t)
-                          (current-column)))))
+           persistent
+           (save-excursion
+             (when (search-forward wl-summary-new-uncached-mark nil t)
+               (current-column)))))
     (setq wl-summary-buffer-temp-mark-column temp
          wl-summary-buffer-persistent-mark-column persistent)))
 
@@ -2771,7 +2773,9 @@ The mark is decided according to the FOLDER, FLAGS and CACHED."
        (setq mark
              (case (car priorities)
                (new
-                wl-summary-new-mark)
+                (if cached
+                    wl-summary-new-cached-mark
+                  wl-summary-new-uncached-mark))
                (important
                 wl-summary-important-mark)
                (answered

diff --git a/wl/wl-vars.el b/wl/wl-vars.el
index aa80a27..c30a753 100644 (file)
--- a/wl/wl-vars.el
+++ b/wl/wl-vars.el
@@ -965,8 +965,13 @@ cdr of each cons cell is used for draft message."
                        (const :format "%v " unread)))
   :group 'wl-summary)
 
-(defcustom wl-summary-new-mark "N"
-  "Mark for new message."
+(defcustom wl-summary-new-uncached-mark "N"
+  "Mark for new and uncached message."
+  :type '(string :tag "Mark")
+  :group 'wl-summary-marks)
+
+(defcustom wl-summary-new-cached-mark "n"
+  "Mark for new but already cached message."
   :type '(string :tag "Mark")
   :group 'wl-summary-marks)
 
@@ -1060,7 +1065,7 @@ This variable is local to the summary buffers."
   :group 'wl-score)
 
 (defcustom wl-summary-score-marks
-  (list wl-summary-new-mark)
+  (list wl-summary-new-uncached-mark wl-summary-new-cached-mark)
   "Persistent marks to scoring."
   :type '(repeat (string :tag "Mark"))
   :group 'wl-score)
@@ -1875,7 +1880,8 @@ Also variables which begin with `wl-' can be specified
   :group 'wl-pref)
 
 (defcustom wl-summary-auto-refile-skip-marks
-  (list wl-summary-new-mark
+  (list wl-summary-new-uncached-mark
+       wl-summary-new-cached-mark
        wl-summary-unread-uncached-mark
        wl-summary-unread-cached-mark)
   "Persistent marks to skip auto-refiling."
@@ -1897,7 +1903,7 @@ the message is skipped at cursor move."
   :group 'wl-summary)
 
 (defcustom wl-summary-incorporate-marks
-  (list wl-summary-new-mark
+  (list wl-summary-new-uncached-mark
        wl-summary-unread-uncached-mark)
   "Persistent marks to prefetch at `wl-summary-incorporate'."
   :type '(repeat (string :tag "Mark"))
@@ -2487,7 +2493,8 @@ ex.
 
 (defcustom wl-summary-expire-reserve-marks
   (list wl-summary-important-mark
-       wl-summary-new-mark
+       wl-summary-new-uncached-mark
+       wl-summary-new-cached-mark
        wl-summary-unread-uncached-mark
        wl-summary-unread-cached-mark)
   "Permanent marks of reserved message when expire.
@@ -2825,6 +2832,10 @@ a symbol `bitmap', `xbm' or `xpm' in order to force the image format."
 
 ;;;; Obsolete variables.
 
+;; 2003-11-05
+(elmo-define-obsolete-variable 'wl-summary-new-mark
+                              'wl-summary-new-uncached-mark)
+
 ;; 2003-07-15 delete -> dispose
 (elmo-define-obsolete-variable 'wl-delete-folder-alist
                               'wl-dispose-folder-alist)