From: okada <okada>
Date: Thu, 27 Sep 2001 09:07:35 +0000 (+0000)
Subject: * wl-vars.el (wl-fcc-force-as-read): New variable.
X-Git-Tag: wl-2_7_5~31
X-Git-Url: http://git.chise.org/gitweb/?a=commitdiff_plain;h=36e07b6bdc534c37d61e2c27c5e34f2b9cb15f48;p=elisp%2Fwanderlust.git

* wl-vars.el (wl-fcc-force-as-read): New variable.
* wl-draft.el (wl-draft-do-fcc): If `wl-fcc-force-as-read' is non-nil,
mark copied message as read.
---

diff --git a/elmo/elmo-imap4.el b/elmo/elmo-imap4.el
index 373726d..c8337c9 100644
--- a/elmo/elmo-imap4.el
+++ b/elmo/elmo-imap4.el
@@ -30,7 +30,7 @@
 ;;
 
 ;;; Commentary:
-;; 
+;;
 ;; Origin of IMAP parser part is imap.el, included in Gnus.
 ;;
 ;;    Copyright (C) 1998, 1999, 2000
@@ -843,7 +843,7 @@ If CHOP-LENGTH is not specified, message set is not chopped."
     (or (elmo-imap4-read-ok session tag)
 	(signal 'elmo-authenticate-error '(elmo-imap4-auth-login)))
     (setq elmo-imap4-status 'auth)))
-  
+
 (luna-define-method
   elmo-network-initialize-session-buffer :after ((session
 						  elmo-imap4-session) buffer)
@@ -888,7 +888,7 @@ If CHOP-LENGTH is not specified, message set is not chopped."
 	(starttls-negotiate process)))))
 
 (luna-define-method elmo-network-authenticate-session ((session
- 							elmo-imap4-session))
+							elmo-imap4-session))
   (with-current-buffer (process-buffer
 			(elmo-network-session-process-internal session))
     (let* ((auth (elmo-network-session-auth-internal session))
@@ -1294,7 +1294,7 @@ Return nil if no complete line has arrived."
 			      (concat "(" (downcase (buffer-substring
 						     (point) (point-max)))
 				      ")"))))
-	   (ACL        (elmo-imap4-parse-acl))
+	   (ACL (elmo-imap4-parse-acl))
 	   (t       (case (prog1 (elmo-read (current-buffer))
 			    (elmo-imap4-forward))
 		      (EXISTS  (list 'exists token))
@@ -1340,7 +1340,7 @@ Return nil if no complete line has arrived."
 		      (setq text (buffer-substring (point) (point-max)))
 		      (list 'bad (list code text)))))
 	     (t   (list 'garbage (buffer-string)))))))))
-		    
+
 (defun elmo-imap4-parse-bye ()
   (let (code text)
     (when (eq (char-after (point)) ?\[)
@@ -1468,7 +1468,7 @@ Return nil if no complete line has arrived."
 		       (list 'bodystructure (elmo-imap4-parse-body)))))
 	  (setq list (cons element list))))
       (and elmo-imap4-fetch-callback
-	   (funcall elmo-imap4-fetch-callback 
+	   (funcall elmo-imap4-fetch-callback
 		    list elmo-imap4-fetch-callback-data))
       (list 'fetch list))))
 
@@ -1716,7 +1716,7 @@ Return nil if no complete line has arrived."
 	  (push (elmo-imap4-parse-nstring) body);; body-fld-md5
 	  (setq body
 		(append (elmo-imap4-parse-body-ext) body)));; body-ext-1part..
-    
+
 	(assert (eq (char-after (point)) ?\)))
 	(elmo-imap4-forward)
 	(nreverse body)))))
@@ -2069,7 +2069,7 @@ If optional argument REMOVE is non-nil, remove FLAG."
 					  (concat
 					   (if elmo-imap4-use-uid "uid ")
 					   (cdr
-					    (car 
+					    (car
 					     (elmo-imap4-make-number-set-list
 					      from-msgs)))
 					   " ")
diff --git a/elmo/elmo-localdir.el b/elmo/elmo-localdir.el
index 2c9c0df..1b351aa 100644
--- a/elmo/elmo-localdir.el
+++ b/elmo/elmo-localdir.el
@@ -86,10 +86,10 @@
 
 (luna-define-method elmo-folder-expand-msgdb-path ((folder
 						    elmo-localdir-folder))
-  (expand-file-name 
+  (expand-file-name
    (mapconcat
     'identity
-    (mapcar 
+    (mapcar
      'elmo-replace-string-as-filename
      (split-string (elmo-localdir-folder-dir-name-internal folder)
 		   "/"))
@@ -163,10 +163,10 @@
 		(elmo-msgdb-append-element
 		 overview entity))
 	  (setq message-id (elmo-msgdb-overview-entity-get-id entity))
-  	  (setq number-alist
-  		(elmo-msgdb-number-add number-alist
-  				       num
-  				       message-id))
+	  (setq number-alist
+		(elmo-msgdb-number-add number-alist
+				       num
+				       message-id))
 	  (setq seen (member message-id seen-list))
 	  (if (setq gmark (or (elmo-msgdb-global-mark-get message-id)
 			      (if (elmo-file-cache-exists-p message-id) ; XXX
@@ -201,7 +201,7 @@
 
 (defsubst elmo-localdir-list-subr (folder &optional nonsort)
   (let ((flist (mapcar 'string-to-int
-		       (directory-files 
+		       (directory-files
 			(elmo-localdir-folder-directory-internal folder)
 			nil "^[0-9]+$" t)))
 	(killed (elmo-msgdb-killed-list-load (elmo-folder-msgdb-path folder))))
@@ -322,7 +322,7 @@
    (expand-file-name (int-to-string number)
 		     (elmo-localdir-folder-directory-internal folder))
    condition number number-list))
-  
+
 (luna-define-method elmo-folder-search ((folder elmo-localdir-folder)
 					condition &optional numbers)
   (let* ((msgs (or numbers (elmo-folder-list-messages folder)))
@@ -380,12 +380,12 @@
 	 (/ (* new-number 100) total)))
       (setq onum (car flist))
       (when (not (eq onum new-number))		; why \=() is wrong..
-        (elmo-bind-directory
+	(elmo-bind-directory
 	 dir
 	 ;; xxx  nfs,hardlink
 	 (rename-file (int-to-string onum) (int-to-string new-number) t))
-        ;; update overview
-        (elmo-msgdb-overview-entity-set-number
+	;; update overview
+	(elmo-msgdb-overview-entity-set-number
 	 (elmo-msgdb-overview-get-entity onum msgdb)
 	 new-number)
 	;; update number-alist
diff --git a/elmo/elmo.el b/elmo/elmo.el
index 8f2d9c9..120640f 100644
--- a/elmo/elmo.el
+++ b/elmo/elmo.el
@@ -27,7 +27,7 @@
 ;;
 
 ;;; Code:
-;; 
+;;
 
 (require 'luna)
 
@@ -239,7 +239,7 @@ IMPORTANT-MARK is the important mark."
 	num-pair result)
     (dolist (mark-pair (or elmo-msgdb-global-mark-alist
 			   (setq elmo-msgdb-global-mark-alist
-				 (elmo-object-load 
+				 (elmo-object-load
 				  (expand-file-name
 				   elmo-msgdb-global-mark-filename
 				   elmo-msgdb-dir)))))
@@ -495,7 +495,7 @@ Return newly created temporary directory name which contains temporary files.")
       (if (not ignore-cache)
 	  (elmo-make-fetch-strategy
 	   'entire
-	   ;; ...But ignore current section cache and re-fetch 
+	   ;; ...But ignore current section cache and re-fetch
 	   ;; if section cache.
 	   (not (eq (elmo-file-cache-status cache-file) 'section))
 	   ;; Save cache.
@@ -1085,7 +1085,7 @@ FIELD is a symbol of the field."
 		   'read)
 	       ;; Mark as read duplicates.
 	       (elmo-folder-mark-as-read folder to-be-deleted))
-	      (t 
+	      (t
 	       ;; Do nothing.
 	       (setq to-be-deleted nil)))
 	(elmo-folder-set-msgdb-internal folder
@@ -1196,7 +1196,7 @@ CROSSED is cross-posted message number.
 If update process is interrupted, return nil."
   (let ((killed-list (elmo-folder-killed-list-internal folder))
 	(before-append t)
-	number-alist mark-alist 
+	number-alist mark-alist
 	old-msgdb diff diff-2 delete-list new-list new-msgdb mark
 	seen-list crossed after-append)
     (setq old-msgdb (elmo-folder-msgdb folder))
@@ -1224,8 +1224,8 @@ If update process is interrupted, return nil."
 				      folder
 				      (eq 'visible-only ignore-msgdb))
 				     (unless ignore-msgdb
-				       (sort (mapcar 
-					      'car 
+				       (sort (mapcar
+					      'car
 					      number-alist)
 					     '<))))
 	  (message "Checking folder diff...done")
diff --git a/wl/ChangeLog b/wl/ChangeLog
index 84f9f06..56683de 100644
--- a/wl/ChangeLog
+++ b/wl/ChangeLog
@@ -1,5 +1,11 @@
 2001-09-26  Kenichi OKADA  <okada@opaopa.org>
 
+	* wl-vars.el (wl-fcc-force-as-read): New variable.
+	* wl-draft.el (wl-draft-do-fcc): If `wl-fcc-force-as-read' is non-nil,
+	mark copied message as read.
+
+2001-09-26  Kenichi OKADA  <okada@opaopa.org>
+
 	* wl-draft.el (wl-draft-send-mail-with-pop-before-smtp): Fixed.
 
 2001-09-26  TAKAHASHI Kaoru  <kaoru@kaisei.org>
diff --git a/wl/wl-draft.el b/wl/wl-draft.el
index 1aed6a4..53aa7be 100644
--- a/wl/wl-draft.el
+++ b/wl/wl-draft.el
@@ -1275,7 +1275,7 @@ If KILL-WHEN-DONE is non-nil, current draft buffer is killed"
 	  (if (elmo-folder-append-buffer
 	       (wl-folder-get-elmo-folder
 		(eword-decode-string (car fcc-list)))
-	       id)
+	       (null wl-fcc-force-as-read))
 	      (wl-draft-write-sendlog 'ok 'fcc nil (car fcc-list) id)
 	    (wl-draft-write-sendlog 'failed 'fcc nil (car fcc-list) id))
 	  (setq fcc-list (cdr fcc-list)))))
diff --git a/wl/wl-vars.el b/wl/wl-vars.el
index b747371..a80a2aa 100644
--- a/wl/wl-vars.el
+++ b/wl/wl-vars.el
@@ -1263,6 +1263,12 @@ with wl-highlight-folder-many-face."
   :group 'wl-draft
   :group 'wl-pref)
 
+(defcustom wl-fcc-force-as-read nil
+  "*If non-nil, mark copied message as read."
+  :type 'boolean
+  :group 'wl-draft
+  :group 'wl-pref)
+
 (defcustom wl-bcc nil
   "*Blind Carbon Copy."
   :type '(choice (const :tag "disable" nil)