(wl-mode-line-buffer-identification): Don't breed excessive titles.

;; From Hiroya Murata-san.

diff --git a/wl/ChangeLog b/wl/ChangeLog
index fb527a7..2eaeeac 100644 (file)
--- a/wl/ChangeLog
+++ b/wl/ChangeLog
@@ -1,3 +1,8 @@
+2000-09-20  Hiroya Murata  <lapis-lazuli@pop06.odn.ne.jp>
+
+       * wl-util.el (wl-mode-line-buffer-identification): Don't breed
+       excessive titles.
+
 2000-09-20  Katsumi Yamaoka    <yamaoka@jpl.org>
 
        * wl.el (wl-plugged-mode): Use revised

diff --git a/wl/wl-util.el b/wl/wl-util.el
index 1c1ef31..7d46e10 100644 (file)
--- a/wl/wl-util.el
+++ b/wl/wl-util.el
@@ -413,10 +413,12 @@ Insert User-Agent field instead of X-Mailer field."
       (while priorities
        (setq priority (car priorities)
              priorities (cdr priorities))
-       (cond ((and wl-biff-check-folder-list (eq 'biff priority))
-              (setq result (append result '(wl-biff-state-indicator))))
-             ((and wl-show-plug-status-on-modeline (eq 'plug priority))
-              (setq result (append result '(wl-plug-state-indicator))))
+       (cond ((eq 'biff priority)
+              (when wl-biff-check-folder-list
+                (setq result (append result '(wl-biff-state-indicator)))))
+             ((eq 'plug priority)
+              (when wl-show-plug-status-on-modeline
+                (setq result (append result '(wl-plug-state-indicator)))))
              (t
               (setq result (append result (or id '("Wanderlust: %12b")))))))
       (prog1