X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=wl%2Fwl-draft.el;h=52c3732fc6bebc4c24efd8e02094fef9033e4a01;hb=40ada79e654909e3b4061f1b7c59c447d00dd1d9;hp=3d16f709eb0fdb1ab598994780b3a1b393398fd6;hpb=027c8139d72c3766b9d0b20496c736bebaceb64a;p=elisp%2Fwanderlust.git

diff --git a/wl/wl-draft.el b/wl/wl-draft.el
index 3d16f70..52c3732 100644
--- a/wl/wl-draft.el
+++ b/wl/wl-draft.el
@@ -43,6 +43,7 @@
 (defvar mail-from-style)
 
 (eval-when-compile
+  (require 'static)
   (require 'elmo-pop3)
   (defalias-maybe 'x-face-insert 'ignore)
   (defalias-maybe 'x-face-insert-version-header 'ignore)
@@ -52,8 +53,9 @@
 (eval-and-compile
   (autoload 'wl-addrmgr "wl-addrmgr"))
 
-(defvar wl-draft-buf-name "Draft")
-(defvar wl-draft-buffer-file-name nil)
+(autoload 'open-ssl-stream "ssl")
+
+(defvar wl-draft-buffer-message-number nil)
 (defvar wl-draft-field-completion-list nil)
 (defvar wl-draft-verbose-send t)
 (defvar wl-draft-verbose-msg nil)
@@ -87,6 +89,12 @@ e.g.
         ((string-match \".*@domain2$\" wl-draft-parent-folder)
          (\"From\" . \"user@domain2\"))))")
 
+(defvar wl-draft-parent-number nil)
+
+(defconst wl-draft-reply-saved-variables
+  '(wl-draft-parent-folder
+    wl-draft-parent-number))
+
 (defvar wl-draft-config-sub-func-alist
   '((body		. wl-draft-config-sub-body)
     (top		. wl-draft-config-sub-top)
@@ -103,7 +111,7 @@ e.g.
     (template		. wl-draft-config-sub-template)
     (x-face		. wl-draft-config-sub-x-face)))
 
-(make-variable-buffer-local 'wl-draft-buffer-file-name)
+(make-variable-buffer-local 'wl-draft-buffer-message-number)
 (make-variable-buffer-local 'wl-draft-buffer-cur-summary-buffer)
 (make-variable-buffer-local 'wl-draft-config-variables)
 (make-variable-buffer-local 'wl-draft-config-exec-flag)
@@ -112,6 +120,10 @@ e.g.
 (make-variable-buffer-local 'wl-draft-fcc-list)
 (make-variable-buffer-local 'wl-draft-reply-buffer)
 (make-variable-buffer-local 'wl-draft-parent-folder)
+(make-variable-buffer-local 'wl-draft-parent-number)
+
+(defvar wl-draft-folder-internal nil
+  "Internal variable for caching `opened' draft folder.")
 
 (defsubst wl-smtp-password-key (user mechanism server)
   (format "SMTP:%s/%s@%s"
@@ -126,6 +138,14 @@ e.g.
 			   (list wl-smtp-authenticate-type)))))
 	    (smtp-use-sasl (and smtp-sasl-mechanisms t))
 	    (smtp-use-starttls (eq wl-smtp-connection-type 'starttls))
+	    (smtp-open-connection-function
+	     (if (eq wl-smtp-connection-type 'ssl)
+		 #'open-ssl-stream
+	       smtp-open-connection-function))
+	    (smtp-end-of-line
+	     (if (eq wl-smtp-connection-type 'ssl)
+		 "\n"
+	       smtp-end-of-line))
 	    smtp-sasl-user-name smtp-sasl-properties sasl-read-passphrase)
        (if (and (string= (car smtp-sasl-mechanisms) "DIGEST-MD5")
 		;; sendmail bug?
@@ -154,48 +174,11 @@ e.g.
   "Insert From field."
   ;; Put the "From:" field in unless for some odd reason
   ;; they put one in themselves.
-  (let* ((login (or user-mail-address (user-login-name)))
-	 (fullname (user-full-name)))
-    (cond ((eq mail-from-style 'angles)
-	   (insert "From: " fullname)
-	   (let ((fullname-start (+ (point-min) (length "From: ")))
-		 (fullname-end (point-marker)))
-	     (goto-char fullname-start)
-	     ;; Look for a character that cannot appear unquoted
-	     ;; according to RFC 822.
-	     (if (re-search-forward "[^- !#-'*+/-9=?A-Z^-~]"
-				    fullname-end 1)
-		 (progn
-		   ;; Quote fullname, escaping specials.
-		   (goto-char fullname-start)
-		   (insert "\"")
-		   (while (re-search-forward "[\"\\]"
-					     fullname-end 1)
-		     (replace-match "\\\\\\&" t))
-		   (insert "\""))))
-	   (insert " <" login ">\n"))
-	  ((eq mail-from-style 'parens)
-	   (insert "From: " login " (")
-	   (let ((fullname-start (point)))
-	     (insert fullname)
-	     (let ((fullname-end (point-marker)))
-	       (goto-char fullname-start)
-	       ;; RFC 822 says \ and nonmatching parentheses
-	       ;; must be escaped in comments.
-	       ;; Escape every instance of ()\ ...
-	       (while (re-search-forward "[()\\]" fullname-end 1)
-		 (replace-match "\\\\\\&" t))
-	       ;; ... then undo escaping of matching parentheses,
-	       ;; including matching nested parentheses.
-	       (goto-char fullname-start)
-	       (while (re-search-forward
-		       "\\(\\=\\|[^\\]\\(\\\\\\\\\\)*\\)\\\\(\\(\\([^\\]\\|\\\\\\\\\\)*\\)\\\\)"
-		       fullname-end 1)
-		 (replace-match "\\1(\\3)" t)
-		 (goto-char fullname-start))))
-	   (insert ")\n"))
-	  ((not mail-from-style)
-	   (insert "From: " login "\n")))))
+  (let (from)
+    (condition-case err
+	(setq from (wl-draft-eword-encode-address-list wl-from))
+      (error (error "Please look at `wl-from' again")))
+    (insert "From: " from "\n")))
 
 (defun wl-draft-insert-x-face-field ()
   "Insert X-Face header."
@@ -308,23 +291,16 @@ e.g.
   (mail-position-on-field "To"))
 
 (defun wl-draft-strip-subject-re (subject)
-  "Remove \"Re:\" from subject lines. Shamelessly copied from Gnus."
+  "Remove \"Re:\" from SUBJECT string. Shamelessly copied from Gnus."
   (if (string-match wl-subject-prefix-regexp subject)
       (substring subject (match-end 0))
     subject))
 
-(defun wl-draft-reply-list-symbol (with-arg)
-  "Return symbol `wl-draft-reply-*-argument-list' match condition.
-Check WITH-ARG and From: field."
-  (if (wl-address-user-mail-address-p (or (elmo-field-body "From") ""))
-      (if with-arg
-	  'wl-draft-reply-myself-with-argument-list
-	'wl-draft-reply-myself-without-argument-list)
-    (if with-arg
-	'wl-draft-reply-with-argument-list
-      'wl-draft-reply-without-argument-list)))
-
-(defun wl-draft-reply (buf with-arg summary-buf)
+(defun wl-draft-self-reply-p ()
+  "Return t when From address in the current message is user's self one or not."
+  (wl-address-user-mail-address-p (or (elmo-field-body "From") "")))
+
+(defun wl-draft-reply (buf with-arg summary-buf &optional number)
   "Reply to BUF buffer message.
 Reply to author if WITH-ARG is non-nil."
 ;;;(save-excursion
@@ -335,7 +311,8 @@ Reply to author if WITH-ARG is non-nil."
       (with-current-buffer summary-buf
 	(setq parent-folder (wl-summary-buffer-folder-name))))
     (set-buffer (or buf mime-mother-buffer))
-    (setq r-list (symbol-value (wl-draft-reply-list-symbol with-arg)))
+    (setq r-list (if with-arg wl-draft-reply-with-argument-list
+		   wl-draft-reply-without-argument-list))
     (catch 'done
       (while r-list
 	(when (let ((condition (car (car r-list))))
@@ -344,8 +321,15 @@ Reply to author if WITH-ARG is non-nil."
 		      ((listp condition)
 		       (catch 'done
 			 (while condition
-			   (if (not (std11-field-body (car condition)))
-			       (throw 'done nil))
+			   (cond
+			    ((stringp (car condition))
+			     (or (std11-field-body (car condition))
+				 (throw 'done nil)))
+			    ((symbolp (car condition))
+			     (or (funcall (car condition))
+				 (throw 'done nil)))
+			    (t
+			     (debug)))
 			   (setq condition (cdr condition)))
 			 t))
 		      ((symbolp condition)
@@ -365,7 +349,7 @@ Reply to author if WITH-ARG is non-nil."
 					      r-to-list))
 				       ",")))
 	    (if (and r-cc-list (symbolp r-cc-list))
-		(setq cc (wl-concat-list (funcall r-to-list) ","))
+		(setq cc (wl-concat-list (funcall r-cc-list) ","))
 	      (setq cc (wl-concat-list (cons cc
 					     (elmo-multiple-fields-body-list
 					      r-cc-list))
@@ -378,8 +362,8 @@ Reply to author if WITH-ARG is non-nil."
 					       ","))))
 	  (throw 'done nil))
 	(setq r-list (cdr r-list)))
-      (error "No match field: check your `%s'"
-	     (symbol-name (wl-draft-reply-list-symbol with-arg))))
+      (error "No match field: check your `wl-draft-reply-%s-argument-list'"
+	     (if with-arg "with" "without")))
     (setq subject (std11-field-body "Subject"))
     (setq to (wl-parse-addresses to)
 	  cc (wl-parse-addresses cc))
@@ -475,14 +459,28 @@ Reply to author if WITH-ARG is non-nil."
 		    (cons 'References references)
 		    (cons 'Mail-Followup-To mail-followup-to))
 	      nil nil nil nil parent-folder)
+    (setq wl-draft-parent-number number)
     (setq wl-draft-reply-buffer buf)
-    (run-hooks 'wl-reply-hook)
-    (or (and to
-	     (progn (mail-position-on-field "To")
-		    (wl-draft-beginning-of-line)))
-	(and newsgroups
-	     (progn (mail-position-on-field "Newsgroups")
-		    (wl-draft-beginning-of-line))))))
+    (setq wl-draft-config-variables
+	  (append wl-draft-reply-saved-variables
+		  wl-draft-config-variables)))
+  (run-hooks 'wl-reply-hook))
+
+(defun wl-draft-reply-position (position)
+  (cond ((eq position 'body)
+	 (wl-draft-body-goto-top))
+	((eq position 'bottom)
+	 (wl-draft-body-goto-bottom))
+	((eq position 'top)
+	 (goto-char (point-min)))
+	((and (stringp position)
+	      (std11-field-body position))
+	 (progn (mail-position-on-field position)
+		(wl-draft-beginning-of-line)))
+	((listp position)
+	 (while (car position)
+	   (wl-draft-reply-position (car position))
+	   (setq position (cdr position))))))
 
 (defun wl-draft-add-references ()
   (wl-draft-add-in-reply-to "References"))
@@ -657,7 +655,7 @@ Reply to author if WITH-ARG is non-nil."
 		  (wl-folder-get-entity-with-petname)
 		wl-folder-entity-hashtb)
 	      nil nil wl-default-spec
-	      'wl-read-folder-hist))
+	      'wl-read-folder-history))
 	(number (call-interactively
 		 (function (lambda (num)
 			     (interactive "nNumber: ")
@@ -681,34 +679,23 @@ Reply to author if WITH-ARG is non-nil."
 (defun wl-default-draft-cite ()
   (let ((mail-yank-ignored-headers "[^:]+:")
 	(mail-yank-prefix "> ")
-	(summary-buf wl-current-summary-buffer)
-	(message-buf (get-buffer (wl-current-message-buffer)))
-	from date cite-title num entity)
-    (if (and summary-buf
-	     (buffer-live-p summary-buf)
-	     message-buf
-	     (buffer-live-p message-buf))
-	(progn
-	  (with-current-buffer summary-buf
-	    (let ((elmo-mime-charset wl-summary-buffer-mime-charset))
-	      (setq num (save-excursion
-			  (set-buffer message-buf)
-			  wl-message-buffer-cur-number))
-	      (setq entity (elmo-msgdb-overview-get-entity
-			    num (wl-summary-buffer-msgdb)))
-	      (setq date (elmo-msgdb-overview-entity-get-date entity))
-	      (setq from (elmo-msgdb-overview-entity-get-from entity))))
-	  (setq cite-title (format "At %s,\n%s wrote:"
-				   (or date "some time ago")
-				   (if wl-default-draft-cite-decorate-author
-				       (funcall wl-summary-from-function
-						(or from "you"))
-				     (or from "you"))))))
-    (and cite-title
-	 (insert cite-title "\n"))
+	date from cite-title)
+    (save-restriction
+      (if (< (mark t) (point))
+	  (exchange-point-and-mark))
+      (narrow-to-region (point)(point-max))
+      (setq date (std11-field-body "date")
+	    from (std11-field-body "from")))
+    (when (or date from)
+      (insert (format "At %s,\n%s wrote:\n"
+		      (or date "some time ago")
+		      (if wl-default-draft-cite-decorate-author
+			  (funcall wl-summary-from-function
+				   (or from "you"))
+			(or from "you")))))
     (mail-indent-citation)))
 
-(defvar wl-draft-buffer nil "Draft buffer to yank content")
+(defvar wl-draft-buffer nil "Draft buffer to yank content.")
 (defun wl-draft-yank-to-draft-buffer (buffer)
   "Yank BUFFER content to `wl-draft-buffer'."
   (set-buffer wl-draft-buffer)
@@ -722,6 +709,7 @@ Reply to author if WITH-ARG is non-nil."
   (if arg
       (let (buf mail-reply-buffer)
 	(elmo-set-work-buf
+	 (insert "\n")
 	 (yank)
 	 (setq buf (current-buffer)))
 	(setq mail-reply-buffer buf)
@@ -731,8 +719,9 @@ Reply to author if WITH-ARG is non-nil."
 (defun wl-draft-hide (editing-buffer)
   "Hide the editing draft buffer if possible."
   (when (and editing-buffer
-	     (buffer-live-p editing-buffer))
-    (set-buffer editing-buffer)
+	     (buffer-live-p editing-buffer)
+	     (get-buffer-window editing-buffer))
+    (select-window (get-buffer-window editing-buffer))
     (let ((sum-buf wl-draft-buffer-cur-summary-buffer)
 	  fld-buf sum-win fld-win)
       (if (and wl-draft-use-frame
@@ -760,19 +749,16 @@ Reply to author if WITH-ARG is non-nil."
 		(switch-to-buffer sum-buf))))))))
 
 (defun wl-draft-delete (editing-buffer)
-  "kill the editing draft buffer and delete the file corresponds to it."
+  "Kill the editing draft buffer and delete the file corresponds to it."
   (save-excursion
     (when editing-buffer
       (set-buffer editing-buffer)
-      (if wl-draft-buffer-file-name
-	  (progn
-	    (if (file-exists-p wl-draft-buffer-file-name)
-		(delete-file wl-draft-buffer-file-name))
-	    (let ((msg (and wl-draft-buffer-file-name
-			    (string-match "[0-9]+$" wl-draft-buffer-file-name)
-			    (string-to-int
-			     (match-string 0 wl-draft-buffer-file-name)))))
-	      (wl-draft-config-info-operation msg 'delete))))
+      (when wl-draft-buffer-message-number
+	(elmo-folder-delete-messages (wl-draft-get-folder)
+				     (list
+				      wl-draft-buffer-message-number))
+	(wl-draft-config-info-operation wl-draft-buffer-message-number
+					'delete))
       (set-buffer-modified-p nil)		; force kill
       (kill-buffer editing-buffer))))
 
@@ -783,8 +769,25 @@ Reply to author if WITH-ARG is non-nil."
     (when (and (or (eq major-mode 'wl-draft-mode)
 		   (eq major-mode 'mail-mode))
 	       (or force-kill
-		   (y-or-n-p "Kill Current Draft? ")))
+		   (yes-or-no-p "Kill Current Draft? ")))
       (let ((cur-buf (current-buffer)))
+	(when (and wl-draft-parent-number
+		   (not (string= wl-draft-parent-folder "")))
+	  (let* ((number wl-draft-parent-number)
+		 (folder-name wl-draft-parent-folder)
+		 (folder (wl-folder-get-elmo-folder folder-name))
+		 buffer)
+	    (if (and (setq buffer (wl-summary-get-buffer folder-name))
+		     (with-current-buffer buffer
+		       (string= (wl-summary-buffer-folder-name)
+				folder-name)))
+		(with-current-buffer buffer
+		  (elmo-folder-unset-flag folder (list number) 'answered)
+		  (when (wl-summary-jump-to-msg number)
+		    (wl-summary-update-persistent-mark)))
+	      (elmo-folder-open folder 'load-msgdb)
+	      (elmo-folder-unset-flag folder (list number) 'answered)
+	      (elmo-folder-close folder))))
 	(wl-draft-hide cur-buf)
 	(wl-draft-delete cur-buf)))
     (message "")))
@@ -1098,6 +1101,10 @@ non-nil."
 			   smtp-sasl-user-name
 			   (car smtp-sasl-mechanisms)
 			   smtp-server)))
+		     (signal (car err) (cdr err)))
+		    (quit
+		     (wl-draft-write-sendlog 'uncertain 'smtp smtp-server
+					     recipients id)
 		     (signal (car err) (cdr err)))))
 		 (wl-draft-set-sent-message 'mail 'sent)
 		 (wl-draft-write-sendlog
@@ -1108,7 +1115,7 @@ non-nil."
 (defun wl-draft-send-mail-with-pop-before-smtp ()
   "Send the prepared message buffer with POP-before-SMTP."
   (require 'elmo-pop3)
-  (let ((session
+  (let ((folder
 	 (luna-make-entity
 	  'elmo-pop3-folder
 	  :user   (or wl-pop-before-smtp-user
@@ -1119,16 +1126,17 @@ non-nil."
 		      elmo-pop3-default-port)
 	  :auth   (or wl-pop-before-smtp-authenticate-type
 		      elmo-pop3-default-authenticate-type)
-	  :stream-type (or wl-pop-before-smtp-stream-type
-			   elmo-pop3-default-stream-type))))
+	  :stream-type (elmo-get-network-stream-type
+			(or wl-pop-before-smtp-stream-type
+			    elmo-pop3-default-stream-type))))
+	session)
     (condition-case error
 	(progn
-	  (elmo-pop3-get-session session)
+	  (setq session (elmo-pop3-get-session folder))
 	  (when session (elmo-network-close-session session)))
       (error
-       (elmo-network-close-session session)
        (unless (string= (nth 1 error) "Unplugged")
-	 (signal (car error)(cdr error))))))
+	 (signal (car error) (cdr error))))))
   (wl-draft-send-mail-with-smtp))
 
 (defun wl-draft-insert-required-fields (&optional force-msgid)
@@ -1154,15 +1162,24 @@ If FORCE-MSGID, insert message-id regardless of `wl-insert-message-id'."
 (defun wl-draft-normal-send-func (editing-buffer kill-when-done)
   "Send the message in the current buffer."
   (save-restriction
-    (std11-narrow-to-header mail-header-separator)
+    (narrow-to-region (goto-char (point-min))
+		      (if (re-search-forward
+			   (concat
+			    "^" (regexp-quote mail-header-separator) "$")
+			   nil t)
+			  (match-beginning 0)
+			(point-max)))
     (wl-draft-insert-required-fields)
-    ;; Delete null fields.
-    (goto-char (point-min))
-    (while (re-search-forward "^[^ \t\n:]+:[ \t]*\n" nil t)
-      (replace-match ""))
     ;; ignore any blank lines in the header
-    (while (re-search-forward "\n\n\n*" nil t)
-      (replace-match "\n")))
+    (while (progn (goto-char (point-min))
+		  (re-search-forward "\n[ \t]*\n\n*" nil t))
+      (replace-match "\n"))
+    (goto-char (point-min))
+    (while (re-search-forward 
+	    "^[^ \t\n:]+:[ \t]*\\(.*\\(\n[ \t].*\\)*\\)\n"
+	    nil t)
+      (when (string= "" (match-string 1))
+	(replace-match ""))))
 ;;;  (run-hooks 'wl-mail-send-pre-hook) ;; X-PGP-Sig, Cancel-Lock
   (wl-draft-dispatch-message)
   (when kill-when-done
@@ -1175,7 +1192,7 @@ If FORCE-MSGID, insert message-id regardless of `wl-insert-message-id'."
   "Send the message in the current buffer.  Not modified the header fields."
   (let (delimline mime-bcc)
     (if (and wl-draft-verbose-send mes-string)
-	(message mes-string))
+	(message "%s" mes-string))
     ;; get fcc folders.
     (setq delimline (wl-draft-get-header-delimiter t))
     (unless wl-draft-fcc-list
@@ -1233,10 +1250,11 @@ If FORCE-MSGID, insert message-id regardless of `wl-insert-message-id'."
 		(setq wl-draft-verbose-msg
 		      (format "Sending%s and Queuing%s..."
 			      sent-via unplugged-via))
-		(message (concat wl-draft-verbose-msg "done")))
+		(message "%sdone" wl-draft-verbose-msg))
 	    (if mes-string
-		(message (concat mes-string
-				 (if sent-via "done" "failed")))))))))
+		(message "%s%s"
+			 mes-string
+			 (if sent-via "done" "failed"))))))))
   (not wl-sent-message-modified)) ;; return value
 
 (defun wl-draft-raw-send (&optional kill-when-done force-pre-hook mes-string)
@@ -1263,6 +1281,49 @@ If FORCE-MSGID, insert message-id regardless of `wl-insert-message-id'."
       (setq locals (cdr locals)))
     result))
 
+(defcustom wl-draft-send-confirm-with-preview t
+  "Non-nil to invoke preview through confirmation of sending.
+This variable is valid when `wl-interactive-send' has non-nil value."
+  :type 'boolean
+  :group 'wl-draft)
+
+(defun wl-draft-send-confirm ()
+  (let (answer)
+    (unwind-protect
+	(condition-case quit
+	    (progn
+	      (when wl-draft-send-confirm-with-preview
+		(wl-draft-preview-message))
+	      (save-excursion
+		(goto-char (point-min)) ; to show recipients in header
+		(catch 'done
+		  (while t
+		    (discard-input)
+		    (message "Send current draft? <y/n/j(down)/k(up)> ")
+		    (setq answer (let ((cursor-in-echo-area t)) (read-char)))
+		    (cond
+		     ((or (eq answer ?y)
+			  (eq answer ?Y)
+			  (eq answer ? ))
+		  (throw 'done t))
+		     ((or (eq answer ?v)
+			  (eq answer ?j)
+			  (eq answer ?J))
+		      (condition-case err
+			  (scroll-up)
+			(error nil)))
+		     ((or (eq answer ?^)
+			  (eq answer ?k)
+			  (eq answer ?K))
+		      (condition-case err
+			  (scroll-down)
+			(error nil)))
+		     (t
+		      (throw 'done nil)))))))
+	  (quit nil))
+      (when wl-draft-send-confirm-with-preview
+	(mime-preview-quit)))))
+
 (defun wl-draft-send (&optional kill-when-done mes-string)
   "Send current draft message.
 If KILL-WHEN-DONE is non-nil, current draft buffer is killed"
@@ -1272,17 +1333,7 @@ If KILL-WHEN-DONE is non-nil, current draft buffer is killed"
   ;; (wl-draft-config-exec)
   (run-hooks 'wl-draft-send-hook)
   (when (or (not wl-interactive-send)
-	    (let (result)
-	      (wl-draft-preview-message)
-	      (goto-char (point-min))
-	      (condition-case nil
-		  (setq result
-			(y-or-n-p "Do you really want to send current draft? "))
-		(quit
-		 (mime-preview-quit)
-		 (signal 'quit nil)))
-	      (mime-preview-quit)
-	      result))
+	    (wl-draft-send-confirm))
     (let ((send-mail-function 'wl-draft-raw-send)
 	  (editing-buffer (current-buffer))
 	  (sending-buffer (wl-draft-generate-clone-buffer
@@ -1292,22 +1343,23 @@ If KILL-WHEN-DONE is non-nil, current draft buffer is killed"
 	  (wl-draft-verbose-msg nil)
 	  err)
       (unwind-protect
-	  (save-excursion (set-buffer sending-buffer)
+	  (save-excursion
+	    (set-buffer sending-buffer)
 	    (if (and (not (wl-message-mail-p))
 		     (not (wl-message-news-p)))
 		(error "No recipient is specified"))
-	    (expand-abbrev) ; for mail-abbrevs
+	    (expand-abbrev)		; for mail-abbrevs
 	    (let ((mime-header-encode-method-alist
 		   (append
 		    '((wl-draft-eword-encode-address-list
-		       .  (To Cc Bcc Resent-To Resent-Cc Bcc Resent-Bcc)))
+		       .  (To Cc Bcc Resent-To Resent-Cc Resent-Bcc From)))
 		    (if (boundp 'mime-header-encode-method-alist)
 			(symbol-value 'mime-header-encode-method-alist)))))
 	      (run-hooks 'mail-send-hook) ; translate buffer
 	      )
 	    ;;
 	    (if wl-draft-verbose-send
-		(message (or mes-string "Sending...")))
+		(message "%s" (or mes-string "Sending...")))
 	    (funcall wl-draft-send-function editing-buffer kill-when-done)
 	    ;; Now perform actions on successful sending.
 	    (while mail-send-actions
@@ -1317,15 +1369,16 @@ If KILL-WHEN-DONE is non-nil, current draft buffer is killed"
 		(error))
 	      (setq mail-send-actions (cdr mail-send-actions)))
 	    (if wl-draft-verbose-send
-		(message (concat (or wl-draft-verbose-msg
-				     mes-string "Sending...")
-				 "done"))))
+		(message "%sdone"
+			 (or wl-draft-verbose-msg
+			     mes-string
+			     "Sending..."))))
 	;; kill sending buffer, anyway.
 	(and (buffer-live-p sending-buffer)
 	     (kill-buffer sending-buffer))))))
 
 (defun wl-draft-mime-bcc-field ()
-  "Return the MIME-Bcc field body. The field is deleted."
+  "Return the MIME-Bcc field body.  The field is deleted."
   (prog1 (std11-field-body wl-draft-mime-bcc-field-name)
     (wl-draft-delete-field wl-draft-mime-bcc-field-name)))
 
@@ -1363,39 +1416,48 @@ If KILL-WHEN-DONE is non-nil, current draft buffer is killed"
 	    (let (wl-interactive-send)
 	      (wl-draft-send 'kill-when-done))))))))
 
-;; Derived from `message-save-drafts' in T-gnus.
 (defun wl-draft-save ()
   "Save current draft."
   (interactive)
   (if (buffer-modified-p)
       (progn
-	(message "Saving %s..." wl-draft-buffer-file-name)
-	(let ((msg (buffer-substring-no-properties (point-min) (point-max))))
-	  (with-temp-file wl-draft-buffer-file-name
+	(message "Saving...")
+	(let ((msg (buffer-substring-no-properties (point-min) (point-max)))
+	      next-number)
+	  (when wl-draft-buffer-message-number
+	    (elmo-folder-delete-messages (wl-draft-get-folder)
+					 (list wl-draft-buffer-message-number))
+	    (wl-draft-config-info-operation wl-draft-buffer-message-number
+					    'delete))
+	  (elmo-folder-check (wl-draft-get-folder))
+	  ;; If no header separator, insert it.
+	  (with-temp-buffer
 	    (insert msg)
-	    ;; If no header separator, insert it.
-	    (save-excursion
+	    (goto-char (point-min))
+	    (unless (re-search-forward
+		     (concat "^" (regexp-quote mail-header-separator) "$")
+		     nil t)
 	      (goto-char (point-min))
-	      (unless (re-search-forward
-		       (concat "^" (regexp-quote mail-header-separator) "$")
-		       nil t)
-		(goto-char (point-min))
-		(if (re-search-forward "\n\n" nil t)
-		    (replace-match (concat "\n" mail-header-separator "\n"))
-		  (goto-char (point-max))
-		  (insert (if (eq (char-before) ?\n) "" "\n")
-			  mail-header-separator "\n"))))
+	      (if (re-search-forward "\n\n" nil t)
+		  (replace-match (concat "\n" mail-header-separator "\n"))
+		(goto-char (point-max))
+		(insert (if (eq (char-before) ?\n) "" "\n")
+			mail-header-separator "\n")))
 	    (let ((mime-header-encode-method-alist
 		   '((eword-encode-unstructured-field-body))))
 	      (mime-edit-translate-buffer))
-	    (wl-draft-get-header-delimiter t)))
-	(set-buffer-modified-p nil)
-	(wl-draft-config-info-operation
-	 (and (string-match "[0-9]+$" wl-draft-buffer-file-name)
-	      (string-to-int
-	       (match-string 0 wl-draft-buffer-file-name)))
-	 'save)
-	(message "Saving %s...done" wl-draft-buffer-file-name))
+	    (wl-draft-get-header-delimiter t)
+	    (setq next-number
+		  (elmo-folder-next-message-number (wl-draft-get-folder)))
+	    (elmo-folder-append-buffer (wl-draft-get-folder)))
+	  (elmo-folder-check (wl-draft-get-folder))
+	  (elmo-folder-commit (wl-draft-get-folder))
+	  (setq wl-draft-buffer-message-number next-number)
+	  (rename-buffer (format "%s/%d" wl-draft-folder next-number))
+	  (setq buffer-file-name (buffer-name))
+	  (set-buffer-modified-p nil)
+	  (wl-draft-config-info-operation wl-draft-buffer-message-number 'save)
+	  (message "Saving...done")))
     (message "(No changes need to be saved)")))
 
 (defun wl-draft-mimic-kill-buffer ()
@@ -1495,6 +1557,11 @@ If KILL-WHEN-DONE is non-nil, current draft buffer is killed"
 			 (progn (forward-line 1) (point)))))
       fcc-list)))
 
+(defcustom wl-draft-fcc-append-read-folder-history t
+  "Non-nil to append fcc'ed folder to `wl-read-folder-history'."
+  :type 'boolean
+  :group 'wl-draft)
+
 (defun wl-draft-do-fcc (header-end &optional fcc-list)
   (let ((send-mail-buffer (current-buffer))
 	(tembuf (generate-new-buffer " fcc output"))
@@ -1524,9 +1591,14 @@ 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)))
-	       (not wl-fcc-force-as-read))
+	       (and wl-fcc-force-as-read '(read)))
 	      (wl-draft-write-sendlog 'ok 'fcc nil (car fcc-list) id)
 	    (wl-draft-write-sendlog 'failed 'fcc nil (car fcc-list) id))
+	  (if (and wl-draft-fcc-append-read-folder-history
+		   (boundp 'wl-read-folder-history))
+	      (or (equal (car fcc-list) (car wl-read-folder-history))
+		  (setq wl-read-folder-history
+			(append (list (car fcc-list)) wl-read-folder-history))))
 	  (setq fcc-list (cdr fcc-list)))))
     (kill-buffer tembuf)))
 
@@ -1569,10 +1641,8 @@ If KILL-WHEN-DONE is non-nil, current draft buffer is killed"
     (wl-init)) ; returns immediately if already initialized.
 
 
-  (let (buf-name header-alist-internal)
-    (setq buf-name
-	  (wl-draft-create-buffer parent-folder))
-
+  (let (buffer header-alist-internal)
+    (setq buffer (wl-draft-create-buffer parent-folder))
     (unless (cdr (assq 'From header-alist))
       (setq header-alist
 	    (append (list (cons 'From wl-from)) header-alist)))
@@ -1604,6 +1674,7 @@ If KILL-WHEN-DONE is non-nil, current draft buffer is killed"
     (if (interactive-p)
 	(run-hooks 'wl-mail-setup-hook))
     (goto-char (point-min))
+    (setq buffer-undo-list nil)
     (wl-user-agent-compose-internal) ;; user-agent
     (cond ((and
 	    (interactive-p)
@@ -1611,48 +1682,38 @@ If KILL-WHEN-DONE is non-nil, current draft buffer is killed"
 	   (mail-position-on-field "To"))
 	  (t
 	   (goto-char (point-max))))
-    buf-name))
+    buffer))
 
 (defun wl-draft-create-buffer (&optional parent-folder)
-  (let* ((draft-folder (wl-folder-get-elmo-folder wl-draft-folder))
+  (let* ((draft-folder (wl-draft-get-folder))
 	 (parent-folder (or parent-folder (wl-summary-buffer-folder-name)))
 	 (summary-buf (wl-summary-get-buffer parent-folder))
 	 (reply-or-forward
 	  (or (eq this-command 'wl-summary-reply)
+	      (eq this-command 'wl-summary-reply-with-citation)
 	      (eq this-command 'wl-summary-forward)
 	      (eq this-command 'wl-summary-target-mark-forward)
 	      (eq this-command 'wl-summary-target-mark-reply-with-citation)))
-	 buf-name file-name num change-major-mode-hook)
-    (if (not (elmo-folder-message-file-p draft-folder))
-	(error "%s folder cannot be used for draft folder" wl-draft-folder))
-    (setq num (elmo-max-of-list
-	       (or (elmo-folder-list-messages draft-folder) '(0))))
-    (setq num (+ 1 num))
-    ;; To get unused buffer name.
-    (while (get-buffer (concat wl-draft-folder "/" (int-to-string num)))
-      (setq num (+ 1 num)))
-    (setq buf-name (find-file-noselect
-		    (setq file-name
-			  (elmo-message-file-name
-			   (wl-folder-get-elmo-folder wl-draft-folder)
-			   num))))
+	 (buffer (generate-new-buffer "*draft*")) ; Just for initial name.
+	 change-major-mode-hook)
+    (set-buffer buffer)
     ;; switch-buffer according to draft buffer style.
     (if wl-draft-use-frame
-	(switch-to-buffer-other-frame buf-name)
+	(switch-to-buffer-other-frame buffer)
       (if reply-or-forward
 	  (case wl-draft-reply-buffer-style
 	    (split
 	     (split-window-vertically)
 	     (other-window 1)
-	     (switch-to-buffer buf-name))
+	     (switch-to-buffer buffer))
 	    (keep
-	     (switch-to-buffer buf-name))
+	     (switch-to-buffer buffer))
 	    (full
 	     (delete-other-windows)
-	     (switch-to-buffer buf-name))
+	     (switch-to-buffer buffer))
 	    (t
 	     (if (functionp wl-draft-reply-buffer-style)
-		 (funcall wl-draft-reply-buffer-style buf-name)
+		 (funcall wl-draft-reply-buffer-style buffer)
 	       (error "Invalid value for wl-draft-reply-buffer-style"))))
 	(case wl-draft-buffer-style
 	  (split
@@ -1660,19 +1721,15 @@ If KILL-WHEN-DONE is non-nil, current draft buffer is killed"
 	     (wl-summary-toggle-disp-msg 'off))
 	   (split-window-vertically)
 	   (other-window 1)
-	   (switch-to-buffer buf-name))
+	   (switch-to-buffer buffer))
 	  (keep
-	   (switch-to-buffer buf-name))
+	   (switch-to-buffer buffer))
 	  (full
 	   (delete-other-windows)
-	   (switch-to-buffer buf-name))
+	   (switch-to-buffer buffer))
 	  (t (if (functionp wl-draft-buffer-style)
-		 (funcall wl-draft-buffer-style buf-name)
+		 (funcall wl-draft-buffer-style buffer)
 	       (error "Invalid value for wl-draft-buffer-style"))))))
-    (set-buffer buf-name)
-    (if (not (string-match (regexp-quote wl-draft-folder)
-			   (buffer-name)))
-	(rename-buffer (concat wl-draft-folder "/" (int-to-string num))))
     (auto-save-mode -1)
     (wl-draft-mode)
     (make-local-variable 'truncate-partial-width-windows)
@@ -1680,12 +1737,11 @@ If KILL-WHEN-DONE is non-nil, current draft buffer is killed"
     (setq truncate-lines wl-draft-truncate-lines)
     (setq wl-sent-message-via nil)
     (setq wl-sent-message-queued nil)
-    (setq wl-draft-buffer-file-name file-name)
     (setq wl-draft-config-exec-flag t)
     (setq wl-draft-parent-folder (or parent-folder ""))
     (or (eq this-command 'wl-folder-write-current-folder)
 	(setq wl-draft-buffer-cur-summary-buffer summary-buf))
-    buf-name))
+    buffer))
 
 (defun wl-draft-create-contents (header-alist)
   "header-alist' sample
@@ -1696,10 +1752,9 @@ If KILL-WHEN-DONE is non-nil, current draft buffer is killed"
                        ;;  insert symbol-value: string
   (symbol . nil)       ;;  do nothing
   nil                  ;;  do nothing
-  )
-"
+  )"
   (unless (eq major-mode 'wl-draft-mode)
-    (error "wl-draft-create-header must be use in wl-draft-mode."))
+    (error "`wl-draft-create-header' must be use in wl-draft-mode"))
   (let ((halist header-alist)
 	field value)
     (while halist
@@ -1734,9 +1789,20 @@ If KILL-WHEN-DONE is non-nil, current draft buffer is killed"
 
 (defun wl-draft-prepare-edit ()
   (unless (eq major-mode 'wl-draft-mode)
-    (error "wl-draft-create-header must be use in wl-draft-mode."))
+    (error "`wl-draft-create-header' must be use in wl-draft-mode"))
   (let (change-major-mode-hook)
     (wl-draft-editor-mode)
+    (static-when (boundp 'auto-save-file-name-transforms)
+      (make-local-variable 'auto-save-file-name-transforms)
+      (setq auto-save-file-name-transforms
+	    (cons (list (concat (regexp-quote wl-draft-folder)
+				"/\\([0-9]+\\)")
+			(concat (expand-file-name
+				 "auto-save-"
+				 (elmo-folder-msgdb-path
+				  (wl-draft-get-folder)))
+				"\\1"))
+		  auto-save-file-name-transforms)))
     (when wl-draft-write-file-function
       (add-hook 'local-write-file-hooks wl-draft-write-file-function))
     (wl-draft-overload-functions)
@@ -1864,7 +1930,7 @@ If KILL-WHEN-DONE is non-nil, current draft buffer is killed"
 		 (cdar condition))
 	    (setq condition (cdr condition)))))
     (unless elmo-nntp-default-function
-      (error "wl-draft-nntp-send: posting-function is nil."))
+      (error "wl-draft-nntp-send: posting-function is nil"))
     (if (not (elmo-plugged-p elmo-nntp-default-server elmo-nntp-default-port))
 	(wl-draft-set-sent-message 'news 'unplugged
 				   (cons elmo-nntp-default-server
@@ -1897,70 +1963,60 @@ If KILL-WHEN-DONE is non-nil, current draft buffer is killed"
 
 (defun wl-draft-remove-text-plain-tag ()
   "Remove text/plain tag of mime-edit."
-  (if (looking-at "^--\\[\\[text/plain\\]\\]$")
-      (delete-region (point-at-bol)(1+ (point-at-eol)))))
+  (when (string= (mime-make-text-tag "plain")
+		 (buffer-substring-no-properties (point-at-bol)(point-at-eol)))
+    (delete-region (point-at-bol)(1+ (point-at-eol)))))
 
 (defun wl-draft-reedit (number)
-  (let ((draft-folder (wl-folder-get-elmo-folder wl-draft-folder))
+  (let ((draft-folder (wl-draft-get-folder))
 	(wl-draft-reedit t)
-	buffer file-name change-major-mode-hook body-top)
-    (setq file-name (elmo-message-file-name draft-folder number))
-    (unless (file-exists-p file-name)
-      (error "File %s does not exist" file-name))
-    (if (setq buffer (get-buffer
-		      (concat wl-draft-folder "/"
-			      (number-to-string number))))
-	(progn
-	  (if wl-draft-use-frame
-	      (switch-to-buffer-other-frame buffer)
-	    (switch-to-buffer buffer))
-	  (set-buffer buffer))
-      (setq buffer (get-buffer-create (number-to-string number)))
-      ;; switch-buffer according to draft buffer style.
-      (if wl-draft-use-frame
-	  (switch-to-buffer-other-frame buffer)
-	(case wl-draft-buffer-style
-	  (split
-	   (split-window-vertically)
-	   (other-window 1)
-	   (switch-to-buffer buffer))
-	  (keep
-	   (switch-to-buffer buffer))
-	  (full
-	   (delete-other-windows)
-	   (switch-to-buffer buffer))
-	  (t (if (functionp wl-draft-buffer-style)
-		 (funcall wl-draft-buffer-style buffer)
-	       (error "Invalid value for wl-draft-buffer-style")))))
-      (set-buffer buffer)
-      (insert-file-contents-as-binary file-name)
-      (let((mime-edit-again-ignored-field-regexp
-	    "^\\(Content-.*\\|Mime-Version\\):"))
-	(wl-draft-decode-message-in-buffer))
-      (setq body-top (wl-draft-insert-mail-header-separator))
-      (if (not (string-match (regexp-quote wl-draft-folder)
-			     (buffer-name)))
-	  (rename-buffer (concat wl-draft-folder "/" (buffer-name))))
-      (auto-save-mode -1)
-      (wl-draft-mode)
-      (setq buffer-file-name file-name)
-      (make-local-variable 'truncate-partial-width-windows)
-      (setq truncate-partial-width-windows nil)
-      (setq truncate-lines wl-draft-truncate-lines)
-      (setq wl-sent-message-via nil)
-      (setq wl-sent-message-queued nil)
-      (setq wl-draft-buffer-file-name file-name)
-      (wl-draft-config-info-operation number 'load)
-      (goto-char (point-min))
-      (wl-draft-overload-functions)
-      (wl-draft-editor-mode)
-      (when wl-draft-write-file-function
-	(add-hook 'local-write-file-hooks wl-draft-write-file-function))
-      (wl-highlight-headers 'for-draft)
-      (goto-char body-top)
-      (run-hooks 'wl-draft-reedit-hook)
-      (goto-char (point-max))
-      buffer)))
+	(num 0)
+	buffer change-major-mode-hook body-top)
+    (setq buffer (get-buffer-create (format "%s/%d" wl-draft-folder
+					    number)))
+    (if wl-draft-use-frame
+	(switch-to-buffer-other-frame buffer)
+      (switch-to-buffer buffer))
+    (set-buffer buffer)
+    (elmo-message-fetch draft-folder number (elmo-make-fetch-strategy 'entire)
+			nil (current-buffer))
+    (elmo-delete-cr-buffer)
+    (let ((mime-edit-again-ignored-field-regexp
+	   "^\\(Content-.*\\|Mime-Version\\):"))
+      (wl-draft-decode-message-in-buffer))
+    (setq body-top (wl-draft-insert-mail-header-separator))
+    (auto-save-mode -1)
+    (wl-draft-mode)
+    (make-local-variable 'truncate-partial-width-windows)
+    (setq truncate-partial-width-windows nil)
+    (setq truncate-lines wl-draft-truncate-lines)
+    (setq wl-sent-message-via nil)
+    (setq wl-sent-message-queued nil)
+    (wl-draft-config-info-operation number 'load)
+    (goto-char (point-min))
+    (wl-draft-overload-functions)
+    (wl-draft-editor-mode)
+    (static-when (boundp 'auto-save-file-name-transforms)
+      (make-local-variable 'auto-save-file-name-transforms)
+      (setq auto-save-file-name-transforms
+	    (cons (list (concat (regexp-quote wl-draft-folder)
+				"/\\([0-9]+\\)")
+			(concat (expand-file-name
+				 "auto-save-"
+				 (elmo-folder-msgdb-path
+				  (wl-draft-get-folder)))
+				"\\1"))
+		  auto-save-file-name-transforms)))
+    (setq buffer-file-name (buffer-name)
+	  wl-draft-parent-folder ""
+	  wl-draft-buffer-message-number number)
+    (when wl-draft-write-file-function
+      (add-hook 'local-write-file-hooks wl-draft-write-file-function))
+    (wl-highlight-headers 'for-draft)
+    (goto-char body-top)
+    (run-hooks 'wl-draft-reedit-hook)
+    (goto-char (point-max))
+    buffer))
 
 (defmacro wl-draft-body-goto-top ()
   (` (progn
@@ -2181,8 +2237,7 @@ Automatically applied in draft sending time."
 	    (insert (concat field ": " content "\n"))))))))
 
 (defun wl-draft-config-info-operation (msg operation)
-  (let* ((msgdb-dir (elmo-folder-msgdb-path (wl-folder-get-elmo-folder
-					     wl-draft-folder)))
+  (let* ((msgdb-dir (elmo-folder-msgdb-path (wl-draft-get-folder)))
 	 (filename
 	  (expand-file-name
 	   (format "%s-%d" wl-draft-config-save-filename msg)
@@ -2246,7 +2301,7 @@ Automatically applied in draft sending time."
   (let ((send-buffer (current-buffer))
 	(folder (wl-folder-get-elmo-folder wl-queue-folder))
 	(message-id (std11-field-body "Message-ID")))
-    (if (elmo-folder-append-buffer folder t)
+    (if (elmo-folder-append-buffer folder)
 	(progn
 	  (wl-draft-queue-info-operation
 	   (car (elmo-folder-status folder))
@@ -2354,8 +2409,7 @@ Automatically applied in draft sending time."
 	(switch-to-buffer buf))))))
 
 (defun wl-jump-to-draft-folder ()
-  (let ((msgs (reverse (elmo-folder-list-messages (wl-folder-get-elmo-folder
-						   wl-draft-folder))))
+  (let ((msgs (reverse (elmo-folder-list-messages (wl-draft-get-folder))))
 	(mybuf (buffer-name))
 	msg buf)
     (if (not msgs)
@@ -2378,8 +2432,86 @@ Automatically applied in draft sending time."
 	    (put-text-property (point-min) (point-max) 'face nil)
 	    (wl-highlight-message (point-min) (point-max) t))
 	(set-buffer-modified-p modified))))
+  (static-when (featurep 'xemacs)
+    ;; Cope with one of many XEmacs bugs that `recenter' takes
+    ;; a long time if there are a lot of invisible text lines.
+    (redraw-frame))
   (recenter n))
 
+;; insert element from history
+(defvar wl-draft-current-history-position nil)
+(defvar wl-draft-history-backup-word "")
+
+(defun wl-draft-previous-history-element (n)
+  (interactive "p")
+  (let (bol history beg end prev new)
+    (when (and (not (wl-draft-on-field-p))
+	       (< (point)
+		  (save-excursion
+		    (goto-char (point-min))
+		    (search-forward (concat "\n" mail-header-separator "\n") nil 0)
+		    (point)))
+	       (save-excursion
+		 (beginning-of-line)
+		 (while (and (looking-at "^[ \t]")
+			     (not (= (point) (point-min))))
+		   (forward-line -1))
+		 (cond
+		  ((looking-at wl-folder-complete-header-regexp)
+		   (and (boundp 'wl-read-folder-history)
+			(setq history wl-read-folder-history)))
+		  ;; ((looking-at wl-address-complete-header-regexp)
+		  ;;  (setq history .....))
+		  (t
+		   nil)))
+	       (eolp))
+      (setq bol (save-excursion (beginning-of-line) (point)))
+      (cond ((and (or (eq last-command 'wl-draft-previous-history-element)
+		      (eq last-command 'wl-draft-next-history-element))
+		  wl-draft-current-history-position)
+	     (setq end (point))
+	     (or (search-backward-regexp ",[ \t]*\\(.*\\)" bol t)
+		 (search-backward-regexp "^[ \t]\\(.*\\)" bol t)
+		 (search-backward-regexp "^[^ \t]*: \\(.*\\)" bol t))
+	     (setq prev (match-string 1))
+	     (goto-char (match-beginning 1))
+	     (setq beg (point))
+	     (if (cond ((< n 0)
+			(>= (+ n wl-draft-current-history-position) 0))
+		       ((> n 0)
+			(<= (+ n wl-draft-current-history-position)
+			    (length history))))
+		 (progn
+		   (setq wl-draft-current-history-position
+			 (+ n wl-draft-current-history-position))
+		   (setq new
+			 (nth wl-draft-current-history-position
+			      (append (list wl-draft-history-backup-word)
+				      history)))
+		   (delete-region beg end)
+		   (insert new))
+	       (goto-char end)
+	       (cond ((< n 0)
+		      (message "End of history; no next item"))
+		     ((> n 0)
+		      (message "Beginning of history; no preceding item")))))
+	    ((and (> n 0)
+		  (save-excursion
+		    (or (search-backward-regexp ",[ \t]*\\(.*\\)" bol t)
+			(search-backward-regexp "^[ \t]\\(.*\\)" bol t)
+			(search-backward-regexp "^[^ \t]*: \\(.*\\)" bol t)))
+		  (car history))
+	     (setq wl-draft-current-history-position 1)
+	     (setq wl-draft-history-backup-word (match-string 1))
+	     (delete-region (match-beginning 1) (match-end 1))
+	     (insert (car history)))
+	    (t
+	     (setq wl-draft-current-history-position nil))))))
+
+(defun wl-draft-next-history-element (n)
+  (interactive "p")
+  (wl-draft-previous-history-element (- n)))
+
 ;;;; user-agent support by Sen Nagata
 
 ;; this appears to be necessarily global...