From a926b5408e53558d49f1c5bde3d1c109f5fde59e Mon Sep 17 00:00:00 2001
From: teranisi <teranisi>
Date: Mon, 25 Jun 2001 07:59:38 +0000
Subject: [PATCH] * wl.el (wl): Check environment before wl-init.

* wl-summary.el (wl-summary-collect-unread): Eliminated.
(wl-summary-mark-as-read-all): Use elmo-folder-list-unreads
instead of wl-summary-collect-unread.
(wl-summary-reply): Split message window.
---
 wl/ChangeLog     |    9 +++++++++
 wl/wl-summary.el |   22 +++++++++-------------
 wl/wl.el         |    5 ++---
 3 files changed, 20 insertions(+), 16 deletions(-)

diff --git a/wl/ChangeLog b/wl/ChangeLog
index cccc480..401b341 100644
--- a/wl/ChangeLog
+++ b/wl/ChangeLog
@@ -1,3 +1,12 @@
+2001-06-25  Yuuichi Teranishi  <teranisi@isl.ntt.co.jp>
+
+	* wl.el (wl): Check environment before wl-init.
+
+	* wl-summary.el (wl-summary-collect-unread): Eliminated.
+	(wl-summary-mark-as-read-all): Use elmo-folder-list-unreads
+	instead of wl-summary-collect-unread.
+	(wl-summary-reply): Split message window.
+
 2001-06-21  Yuuichi Teranishi  <teranisi@gohome.org>
 
 	* wl-vars.el (wl): Set custom-manual link as "wl-ja"
diff --git a/wl/wl-summary.el b/wl/wl-summary.el
index e258dab..42b2911 100644
--- a/wl/wl-summary.el
+++ b/wl/wl-summary.el
@@ -547,18 +547,6 @@
   (if wl-summary-buffer-disp-msg
       (wl-summary-redisplay)))
 
-(defun wl-summary-collect-unread (mark-alist &optional folder)
-  (let (mark ret-val)
-    (while mark-alist
-      (setq mark (cadr (car mark-alist)))
-      (and mark
-	   (or (string= mark wl-summary-new-mark)
-	       (string= mark wl-summary-unread-uncached-mark)
-	       (string= mark wl-summary-unread-cached-mark))
-	   (setq ret-val (cons (car (car mark-alist)) ret-val)))
-      (setq mark-alist (cdr mark-alist)))
-    ret-val))
-
 (defun wl-summary-count-unread (mark-alist)
   (let ((new 0)
 	(unread 0)
@@ -1599,7 +1587,12 @@ If ARG is non-nil, checking is omitted."
 	     (case-fold-search nil)
 	     msg mark)
 	(message "Setting all msgs as read...")
-	(elmo-folder-mark-as-read folder (wl-summary-collect-unread mark-alist))
+	(elmo-folder-mark-as-read folder
+				  (elmo-folder-list-unreads
+				   folder
+				   (list wl-summary-unread-cached-mark
+					 wl-summary-unread-uncached-mark
+					 wl-summary-new-mark)))
 	(save-excursion
 	  (goto-char (point-min))
 	  (while (re-search-forward "^ *\\(-?[0-9]+\\)[^0-9]\\([^0-9 ]\\)" nil t)
@@ -4878,6 +4871,9 @@ Reply to author if invoked with ARG."
       (wl-message-select-buffer wl-message-buffer)
       (set-buffer mes-buf)
       (goto-char (point-min))
+      (or wl-draft-use-frame
+	  (split-window-vertically))
+      (other-window 1)
       (when (setq mes-buf (wl-message-get-original-buffer))
 	(wl-draft-reply mes-buf arg summary-buf)
 	(unless without-setup-hook
diff --git a/wl/wl.el b/wl/wl.el
index d1e20d9..5b6cb9d 100644
--- a/wl/wl.el
+++ b/wl/wl.el
@@ -772,9 +772,7 @@ If ARG (prefix argument) is specified, folder checkings are skipped."
   (elmo-init)
   (let (demo-buf)
     (unless wl-init
-      (if wl-demo (setq demo-buf (wl-demo))))
-    (wl-init)
-    (unless wl-init
+      (if wl-demo (setq demo-buf (wl-demo)))
       (condition-case nil
 	  (progn
 	    (message "Checking environment...")
@@ -782,6 +780,7 @@ If ARG (prefix argument) is specified, folder checkings are skipped."
 	    (message "Checking environment...done"))
 	(error)
 	(quit)))
+    (wl-init)
     (condition-case obj
 	(progn
 	  (wl-plugged-init (wl-folder arg))
-- 
1.7.10.4