* wl-summary.el (wl-summary-auto-select-msg-p): New function.

  (wl-summary-goto-folder-subr): If `wl-auto-select-first' is non-nil
  and selected message is important, do not display.

diff --git a/wl/ChangeLog b/wl/ChangeLog
index a8c7c3c..1a838ba 100644 (file)
--- a/wl/ChangeLog
+++ b/wl/ChangeLog
@@ -1,3 +1,9 @@
+2001-05-19  Masahiro MURATA  <muse@ba2.so-net.ne.jp>
+
+       * wl-summary.el (wl-summary-auto-select-msg-p): New function.
+       (wl-summary-goto-folder-subr): If `wl-auto-select-first' is
+       non-nil and selected message is important, do not display.
+
 2001-05-16  Kenichi OKADA  <okada@opaopa.org>
 
        * wl.el (wl): Omit `wl-check-environment' if wl-init is nil.
@@ -92,7 +98,7 @@
        * wl-summary.el (wl-summary-set-message-buffer-or-redisplay):
        Check wl-message-buffer lives before set-buffer.
 
-2001-04-07  Masahiro MURATA  <muse@ba2.so-net.ne.jp>
+2001-04-22  Masahiro MURATA  <muse@ba2.so-net.ne.jp>
 
        * wl-expire.el (wl-summary-expire): Fixed problem that do not expire
        called in folder mode.

diff --git a/wl/wl-summary.el b/wl/wl-summary.el
index 6efe7ea..0be6d00 100644 (file)
--- a/wl/wl-summary.el
+++ b/wl/wl-summary.el
@@ -2460,6 +2460,14 @@ If ARG, without confirm."
         (lambda (x) (elmo-msgdb-overview-entity-get-number x))
         (elmo-msgdb-get-overview (wl-summary-buffer-msgdb)))))
 
+(defun wl-summary-auto-select-msg-p (unread-msg)
+  (and unread-msg
+       (not (string=
+            (cadr (assoc unread-msg
+                         (elmo-msgdb-get-mark-alist
+                          (wl-summary-buffer-msgdb))))
+            wl-summary-important-mark))))
+
 (defun wl-summary-goto-folder-subr (&optional name scan-type other-window
                                              sticky interactive scoring)
   "Display target folder on summary."
@@ -2575,9 +2583,13 @@ If ARG, without confirm."
              (let ((unreadp (wl-summary-next-message 
                              (wl-summary-message-number)
                              'down t)))
-               (cond ((and wl-auto-select-first unreadp)
+               (cond ((and wl-auto-select-first
+                           (wl-summary-auto-select-msg-p unreadp))
+                      ;; wl-auto-select-first is non-nil and
+                      ;; unreadp is non-nil but not important
                       (setq retval 'disp-msg))
-                     ((not unreadp)
+                     ((not (wl-summary-auto-select-msg-p unreadp))
+                      ;; unreadp is nil or important
                       (setq retval 'more-next))))
            (goto-char (point-max))
            (if (elmo-folder-plugged-p folder)