(wl-summary-update-mark-and-highlight-window): No

check `wl-summary-highlight'.
(wl-summary-window-scroll-functions): Respect value of
`wl-summary-highlight'.
(wl-summary-sync-update): Run hooks
`wl-summary-buffer-window-scroll-functions' at any time.

diff --git a/wl/ChangeLog b/wl/ChangeLog
index 374aea4..0c07a95 100644 (file)
--- a/wl/ChangeLog
+++ b/wl/ChangeLog
@@ -1,3 +1,12 @@
+2004-06-19  Hiroya Murata  <lapis-lazuli@pop06.odn.ne.jp>
+
+       * wl-summary.el (wl-summary-update-mark-and-highlight-window): No
+       check `wl-summary-highlight'.
+       (wl-summary-window-scroll-functions): Respect value of
+       `wl-summary-highlight'.
+       (wl-summary-sync-update): Run hooks
+       `wl-summary-buffer-window-scroll-functions' at any time.
+
 2004-06-20  Yoichi NAKAYAMA  <yoichi@geiin.org>
 
        * wl-summary.el (wl-summary-exec-with-confirmation): Extracted
@@ -1052,7 +1061,7 @@
        wl-summary-buffer-unsync-mark-number-list.
        (wl-summary-goto-folder-subr): Set
        wl-summary-buffer-unsync-mark-number-list and
-       use wl-summary-window-scroll-functions insteaf of
+       use wl-summary-window-scroll-functions instead of
        wl-summary-lazy-highlight.
 
        * wl-vars.el (wl-summary-lazy-update-mark): New user option.

diff --git a/wl/wl-summary.el b/wl/wl-summary.el
index 7860827..e8f9430 100644 (file)
--- a/wl/wl-summary.el
+++ b/wl/wl-summary.el
@@ -596,16 +596,17 @@ See also variable `wl-use-petname'."
                                              number))
              (let (wl-summary-highlight)
                (wl-summary-update-persistent-mark number flags))
-             (if wl-summary-highlight
-                 (wl-highlight-summary-current-line number flags)))
+             (wl-highlight-summary-current-line number flags))
            (forward-line 1)))))
     (set-buffer-modified-p nil)))
 
 (defun wl-summary-window-scroll-functions ()
-  (cond ((and wl-summary-lazy-highlight
+  (cond ((and wl-summary-highlight
+             wl-summary-lazy-highlight
              wl-summary-lazy-update-mark)
         (list 'wl-summary-update-mark-and-highlight-window))
-       (wl-summary-lazy-highlight
+       ((and wl-summary-highlight
+             wl-summary-lazy-highlight)
         (list 'wl-highlight-summary-window))
        (wl-summary-lazy-update-mark
         (list 'wl-summary-update-mark-window))))
@@ -2035,9 +2036,7 @@ This function is defined for `window-scroll-functions'"
                                wl-summary-highlight-partial-threshold)))
              (wl-highlight-summary (point) (point-max))))))
       (wl-delete-all-overlays)
-      (when (and wl-summary-highlight
-                wl-summary-lazy-highlight)
-       (run-hooks 'wl-summary-buffer-window-scroll-functions))
+      (run-hooks 'wl-summary-buffer-window-scroll-functions)
       (set-buffer-modified-p nil)
       (if mes (message "%s" mes)))))