From: yoichi <yoichi>
Date: Mon, 11 Mar 2002 11:19:17 +0000 (+0000)
Subject:         * wl-summary.el (wl-summary-write-current-folder): Call wl-draft
X-Git-Tag: wl-2_9_8~3
X-Git-Url: http://git.chise.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=37e57871fb83ded86962e741e3561bceafb065e2;p=elisp%2Fwanderlust.git

    * wl-summary.el (wl-summary-write-current-folder): Call wl-draft
        even if the guess failed.

        * wl-e21.el (wl-folder-toolbar): Remove "Guess" icon.
        (wl-summary-toolbar): Remove "Guess" icon and use "New" icon for
        wl-summary-write-current-folder.
        * wl-xmas.el: Ditto.
---

diff --git a/wl/ChangeLog b/wl/ChangeLog
index 7e50444..3b05f10 100644
--- a/wl/ChangeLog
+++ b/wl/ChangeLog
@@ -1,3 +1,13 @@
+2002-03-11  Yoichi NAKAYAMA  <yoichi@eken.phys.nagoya-u.ac.jp>
+
+	* wl-summary.el (wl-summary-write-current-folder): Call wl-draft
+	even if the guess failed.
+
+	* wl-e21.el (wl-folder-toolbar): Remove "Guess" icon.
+	(wl-summary-toolbar): Remove "Guess" icon and use "New" icon for
+	wl-summary-write-current-folder.
+	* wl-xmas.el: Ditto.
+
 2002-03-11  Yuuichi Teranishi  <teranisi@gohome.org>
 
 	* wl-summary.el (wl-summary-next-page): Force display message if
diff --git a/wl/wl-e21.el b/wl/wl-e21.el
index 11d3cfc..cc10c79 100644
--- a/wl/wl-e21.el
+++ b/wl/wl-e21.el
@@ -101,8 +101,6 @@
      wl-folder-sync-current-entity t "Sync Current Folder"]
     [wl-draft
      wl-draft t "Write a New Message"]
-    [wl-write-current-folder
-     wl-folder-write-current-folder t "Write for Current Folder"]
     [wl-folder-goto-draft-folder
      wl-folder-goto-draft-folder t "Go to Draft Folder"]
     [wl-folder-empty-trash
@@ -128,8 +126,6 @@
     [wl-summary-mark-as-important
      wl-summary-mark-as-important t "Mark Current Message as Important"]
     [wl-draft
-     wl-draft t "Write a New Message"]
-    [wl-write-current-folder
      wl-summary-write-current-folder t "Write for Current Folder"]
     [wl-summary-reply
      wl-summary-reply t "Reply to Current Message" ]
diff --git a/wl/wl-summary.el b/wl/wl-summary.el
index a0a546b..f724f55 100644
--- a/wl/wl-summary.el
+++ b/wl/wl-summary.el
@@ -5015,20 +5015,20 @@ Use function list is `wl-summary-write-current-folder-functions'."
 	  (setq func-list (cdr func-list))
 	(setq guess-func (car func-list))
 	(setq func-list nil)))
-    (when (null guess-func)
-      (error "Can't guess by folder %s" folder))
-    (unless (or (stringp (nth 0 guess-list))
-		(stringp (nth 1 guess-list))
-		(stringp (nth 2 guess-list)))
-      (error "Invalid value return guess function `%s'"
-	     (symbol-name guess-func)))
-    (wl-draft (nth 0 guess-list) nil nil ; To:
-	      (nth 1 guess-list) nil	; Cc:
-	      (nth 2 guess-list)	; Newsgroups:
-	      nil nil nil nil nil nil
-	      folder)
-    (run-hooks 'wl-mail-setup-hook)
-    (mail-position-on-field "Subject")))
+    (if (null guess-func)
+	(wl-draft)
+      (unless (or (stringp (nth 0 guess-list))
+		  (stringp (nth 1 guess-list))
+		  (stringp (nth 2 guess-list)))
+	(error "Invalid value return guess function `%s'"
+	       (symbol-name guess-func)))
+      (wl-draft (nth 0 guess-list) nil nil ; To:
+		(nth 1 guess-list) nil	; Cc:
+		(nth 2 guess-list)	; Newsgroups:
+		nil nil nil nil nil nil
+		folder)
+      (run-hooks 'wl-mail-setup-hook)
+      (mail-position-on-field "Subject"))))
 
 (defun wl-summary-forward (&optional without-setup-hook)
   ""
diff --git a/wl/wl-xmas.el b/wl/wl-xmas.el
index 8f1bb42..90b5f23 100644
--- a/wl/wl-xmas.el
+++ b/wl/wl-xmas.el
@@ -69,8 +69,6 @@
      wl-folder-sync-current-entity t "Sync Current Folder"]
     [wl-draft
      wl-draft t "Write a New Message"]
-    [wl-write-current-folder
-     wl-folder-write-current-folder t "Write for Current Folder"]
     [wl-folder-goto-draft-folder
      wl-folder-goto-draft-folder t "Go to Draft Folder"]
     [wl-folder-empty-trash
@@ -96,8 +94,6 @@
     [wl-summary-mark-as-important
      wl-summary-mark-as-important t "Mark Current Message as Important"]
     [wl-draft
-     wl-draft t "Write a New Message"]
-    [wl-write-current-folder
      wl-summary-write-current-folder t "Write for Current Folder"]
     [wl-summary-reply
      wl-summary-reply t "Reply to Current Message" ]