From: teranisi <teranisi>
Date: Wed, 22 May 2002 01:36:54 +0000 (+0000)
Subject: * wl-vars.el (wl-draft-disable-bcc-for-mime-bcc): New user option.
X-Git-Tag: elmo-mark-root~101
X-Git-Url: http://git.chise.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7894c26e9a254de0b32539d794151568c4cf7500;p=elisp%2Fwanderlust.git

* wl-vars.el (wl-draft-disable-bcc-for-mime-bcc): New user option.
(wl-draft-disable-fcc-for-mime-bcc): Ditto.

* wl-draft.el (wl-draft-deduce-address-list): Disable bcc while
mime-bcc if wl-draft-disable-bcc-for-mime-bcc is non-nil.
(wl-draft-get-fcc-list): Likewise.

* wl-thread.el (wl-thread-indent-regexp): Abolished.
(wl-thread-entity-cur): Ditto.
* wl-summary.el (wl-summary-buffer-set-folder): Removed
wl-thread-indent-regexp	setting.
(wl-summary-sync-update): Removed wl-thread-entity-cur setting.

* wl-summary.el (wl-summary-display-top): Highlight summary window when
wl-summary-lazy-highlight.
(wl-summary-display-bottom): Ditto.

* wl-thread.el (wl-thread-open-close): Likewise.
---

diff --git a/wl/ChangeLog b/wl/ChangeLog
index 644c553..ebab707 100644
--- a/wl/ChangeLog
+++ b/wl/ChangeLog
@@ -1,5 +1,26 @@
+2002-05-22  Yuuichi Teranishi  <teranisi@gohome.org>
+
+	* wl-vars.el (wl-draft-disable-bcc-for-mime-bcc): New user option.
+	(wl-draft-disable-fcc-for-mime-bcc): Ditto.
+
+	* wl-draft.el (wl-draft-deduce-address-list): Disable bcc while
+	mime-bcc if wl-draft-disable-bcc-for-mime-bcc is non-nil.
+	(wl-draft-get-fcc-list): Likewise.
+
 2002-05-21  Yuuichi Teranishi  <teranisi@gohome.org>
 
+	* wl-thread.el (wl-thread-indent-regexp): Abolished.
+	(wl-thread-entity-cur): Ditto.
+	* wl-summary.el (wl-summary-buffer-set-folder): Removed
+	wl-thread-indent-regexp	setting.
+	(wl-summary-sync-update): Removed wl-thread-entity-cur setting.
+
+	* wl-summary.el (wl-summary-display-top): Highlight summary window when
+	wl-summary-lazy-highlight.
+	(wl-summary-display-bottom): Ditto.
+
+	* wl-thread.el (wl-thread-open-close): Likewise.
+
 	* wl-draft.el (wl-draft-do-mime-bcc): Decode field body of original
 	from and subject;
 	Bind wl-draft-use-frame;
diff --git a/wl/wl-draft.el b/wl/wl-draft.el
index b0a28d1..80610d0 100644
--- a/wl/wl-draft.el
+++ b/wl/wl-draft.el
@@ -988,7 +988,10 @@ from current buffer."
   "Get address list suitable for smtp RCPT TO:<address>.
 Group list content is removed if `wl-draft-remove-group-list-contents' is
 non-nil."
-  (let ((fields '("to" "cc" "bcc"))
+  (let ((fields (if (and wl-draft-doing-mime-bcc
+			 wl-draft-disable-bcc-for-mime-bcc)
+		    '("to" "cc")
+		  '("to" "cc" "bcc")))
 	(resent-fields '("resent-to" "resent-cc" "resent-bcc"))
 	(case-fold-search t)
 	addrs recipients)
@@ -1428,26 +1431,31 @@ If KILL-WHEN-DONE is non-nil, current draft buffer is killed"
 	    (point-max)))))))
 
 (defun wl-draft-get-fcc-list (header-end)
-  (let (fcc-list
-	(case-fold-search t))
-    (or (markerp header-end) (error "HEADER-END must be a marker"))
-    (save-excursion
-      (goto-char (point-min))
-      (while (re-search-forward "^Fcc:[ \t]*" header-end t)
-	(setq fcc-list
-	      (cons (buffer-substring-no-properties
-		     (point)
-		     (progn
-		       (end-of-line)
-		       (skip-chars-backward " \t")
-		       (point)))
-		    fcc-list))
-	(save-match-data
-	  (wl-folder-confirm-existence
-	   (wl-folder-get-elmo-folder (eword-decode-string (car fcc-list)))))
-	(delete-region (match-beginning 0)
-		       (progn (forward-line 1) (point)))))
-    fcc-list))
+  (if (and wl-draft-doing-mime-bcc
+	   wl-draft-disable-fcc-for-mime-bcc)
+      (progn
+	(wl-draft-delete-field "fcc")
+	nil)
+    (let (fcc-list
+	  (case-fold-search t))
+      (or (markerp header-end) (error "HEADER-END must be a marker"))
+      (save-excursion
+	(goto-char (point-min))
+	(while (re-search-forward "^Fcc:[ \t]*" header-end t)
+	  (setq fcc-list
+		(cons (buffer-substring-no-properties
+		       (point)
+		       (progn
+			 (end-of-line)
+			 (skip-chars-backward " \t")
+			 (point)))
+		      fcc-list))
+	  (save-match-data
+	    (wl-folder-confirm-existence
+	     (wl-folder-get-elmo-folder (eword-decode-string (car fcc-list)))))
+	  (delete-region (match-beginning 0)
+			 (progn (forward-line 1) (point)))))
+      fcc-list)))
 
 (defun wl-draft-do-fcc (header-end &optional fcc-list)
   (let ((send-mail-buffer (current-buffer))
diff --git a/wl/wl-summary.el b/wl/wl-summary.el
index 8bae5b8..a6d7aa8 100644
--- a/wl/wl-summary.el
+++ b/wl/wl-summary.el
@@ -549,6 +549,8 @@
 (defun wl-summary-display-top ()
   (interactive)
   (goto-char (point-min))
+  (when wl-summary-lazy-highlight
+    (wl-highlight-summary-window))
   (if wl-summary-buffer-disp-msg
       (wl-summary-redisplay)))
 
@@ -556,6 +558,8 @@
   (interactive)
   (goto-char (point-max))
   (forward-line -1)
+  (when wl-summary-lazy-highlight
+    (wl-highlight-summary-window))
   (if wl-summary-buffer-disp-msg
       (wl-summary-redisplay)))
 
@@ -787,13 +791,6 @@ you."
    wl-thread-space-str-internal
    (or (nth 5 wl-summary-buffer-thread-indent-set)
        wl-thread-space-str))
-  (setq wl-thread-indent-regexp
-	(concat
-	 (regexp-quote wl-thread-have-younger-brother-str-internal) "\\|"
-	 (regexp-quote wl-thread-youngest-child-str-internal) "\\|"
-	 (regexp-quote wl-thread-vertical-str-internal) "\\|"
-	 (regexp-quote wl-thread-horizontal-str-internal) "\\|"
-	 (regexp-quote wl-thread-space-str-internal)))
   (run-hooks 'wl-summary-buffer-set-folder-hook))
 
 (defun wl-summary-mode ()
@@ -2008,7 +2005,6 @@ If ARG is non-nil, checking is omitted."
 		(when (and sync-all (eq wl-summary-buffer-view 'thread))
 		  (elmo-kill-buffer wl-summary-search-buf-name)
 		  (message "Inserting thread...")
-		  (setq wl-thread-entity-cur 0)
 		  (wl-thread-insert-top)
 		  (message "Inserting thread...done"))
 		(if elmo-use-database
diff --git a/wl/wl-thread.el b/wl/wl-thread.el
index 51cc684..fe8c722 100644
--- a/wl/wl-thread.el
+++ b/wl/wl-thread.el
@@ -41,13 +41,10 @@
 (defvar wl-thread-entities nil)
 (defvar wl-thread-entity-list nil)	; entity list
 (defvar wl-thread-entity-hashtb nil)	; obarray
-(defvar wl-thread-indent-regexp nil)
 
 (make-variable-buffer-local 'wl-thread-entity-hashtb)
 (make-variable-buffer-local 'wl-thread-entities)     ; ".wl-thread-entity"
 (make-variable-buffer-local 'wl-thread-entity-list)  ; ".wl-thread-entity-list"
-(make-variable-buffer-local 'wl-thread-entity-cur)
-(make-variable-buffer-local 'wl-thread-indent-regexp)
 
 ;;; global flag
 (defvar wl-thread-insert-force-opened nil)
@@ -1087,6 +1084,8 @@ Message is inserted to the summary buffer."
 	      (wl-summary-jump-to-msg msg)
 	      (wl-thread-close
 	       (wl-thread-get-entity (wl-summary-message-number)))))))
+      (when wl-summary-lazy-highlight
+	(wl-highlight-summary-window))
       (wl-summary-set-message-modified)
       (set-buffer-modified-p nil))))
 
diff --git a/wl/wl-vars.el b/wl/wl-vars.el
index daee6fe..bbc4ae1 100644
--- a/wl/wl-vars.el
+++ b/wl/wl-vars.el
@@ -1098,6 +1098,16 @@ If nil, a string `This is a blind carbon copy.' is used."
   :type '(string :tag "Body")
   :group 'wl-draft)
 
+(defcustom wl-draft-disable-bcc-for-mime-bcc t
+  "Disable Bcc while MIME-encapsulated Bcc."
+  :type 'boolean
+  :group 'wl-draft)
+
+(defcustom wl-draft-disable-fcc-for-mime-bcc t
+  "Disable Fcc while MIME-encapsulated Bcc."
+  :type 'boolean
+  :group 'wl-draft)
+
 (defcustom wl-draft-config-alist nil
   "Alist of configuration field on draft.
 ex.