From 94c9ba5d3c9817b9aff4545622e9e7812f822263 Mon Sep 17 00:00:00 2001
From: kaoru <kaoru>
Date: Wed, 18 Jun 2003 18:49:38 +0000
Subject: [PATCH] * wl-summary.el (wl-summary-goto-folder-subr): Don't
 restrict `wl-summary-highlight'. (wl-summary-reedit): Use
 `cond' instead of nested `if'.

---
 wl/ChangeLog     |    4 ++++
 wl/wl-summary.el |   27 +++++++++++++--------------
 2 files changed, 17 insertions(+), 14 deletions(-)

diff --git a/wl/ChangeLog b/wl/ChangeLog
index 9aad78d..5618051 100644
--- a/wl/ChangeLog
+++ b/wl/ChangeLog
@@ -1,5 +1,9 @@
 2003-06-18  TAKAHASHI Kaoru  <kaoru@kaisei.org>
 
+	* wl-summary.el (wl-summary-goto-folder-subr): Don't restrict
+	`wl-summary-highlight'.
+	(wl-summary-reedit): Use `cond' instead of nested `if'.
+
 	* wl-fldmgr.el (wl-fldmgr-folders-header): Add more comment.
 	(wl-fldmgr-save-folders): Fix comment.
 	(wl-fldmgr-rename): Do nothing on the last line.
diff --git a/wl/wl-summary.el b/wl/wl-summary.el
index 6a00eec..00344bc 100644
--- a/wl/wl-summary.el
+++ b/wl/wl-summary.el
@@ -608,17 +608,18 @@ If optional USE-CACHE is non-nil, use cache if exists."
   "Re-edit current message.
 If ARG is non-nil, Supersedes message"
   (interactive "P")
-  (if arg
-      (wl-summary-supersedes-message)
-    (if (string= (wl-summary-buffer-folder-name) wl-draft-folder)
-	(if (wl-summary-message-number)
-	    (progn
-	      (wl-draft-reedit (wl-summary-message-number))
-	      (if (wl-message-news-p)
-		  (mail-position-on-field "Newsgroups")
-		(mail-position-on-field "To"))
-	      (delete-other-windows)))
-      (wl-draft-edit-string (wl-summary-message-string)))))
+  (cond
+   ((not (wl-summary-message-number))
+    (message "No message."))
+   (arg
+    (wl-summary-supersedes-message))
+   ((string= (wl-summary-buffer-folder-name) wl-draft-folder)
+    (wl-draft-reedit (wl-summary-message-number))
+    (if (wl-message-news-p)
+	(mail-position-on-field "Newsgroups")
+      (mail-position-on-field "To")))
+   (t
+    (wl-draft-edit-string (wl-summary-message-string)))))
 
 (defun wl-summary-resend-bounced-mail ()
   "Re-mail the current message.
@@ -2494,10 +2495,8 @@ If ARG, without confirm."
 	(wl-summary-rescan))
       (wl-summary-toggle-disp-msg (if wl-summary-buffer-disp-msg 'on 'off))
       (unless (and reuse-buf keep-cursor)
-	;(setq hilit wl-summary-highlight)
 	(unwind-protect
-	    (let ((wl-summary-highlight (if reuse-buf wl-summary-highlight))
-		  (wl-use-scoring
+	    (let ((wl-use-scoring
 		   (if (or scoring interactive) wl-use-scoring)))
 	      (if (and (not scan-type)
 		       interactive
-- 
1.7.10.4