Synch up with main trunk.

[elisp/wanderlust.git] / wl / wl-mime.el

diff --git a/wl/wl-mime.el b/wl/wl-mime.el
index 3c5cd88..385329f 100644 (file)
--- a/wl/wl-mime.el
+++ b/wl/wl-mime.el
@@ -69,18 +69,28 @@ By setting following-method as yank-content."
 (defalias 'wl-draft-enclose-digest-region 'mime-edit-enclose-digest-region)
 
 (defun wl-draft-preview-message ()
-  ""
+  "Preview editing message."
   (interactive)
   (let* (recipients-message
+        (current-point (point))
         (config-exec-flag wl-draft-config-exec-flag)
+        (parent-folder wl-draft-parent-folder)
         (mime-display-header-hook 'wl-highlight-headers)
+        (mime-header-encode-method-alist
+         (append
+          '((wl-draft-eword-encode-address-list
+             .  (To Cc Bcc Resent-To Resent-Cc Bcc Resent-Bcc)))
+          (if (boundp 'mime-header-encode-method-alist)
+              (symbol-value 'mime-header-encode-method-alist))))
         mime-view-ignored-field-list   ; all header.
         (mime-edit-translate-buffer-hook
          (append
           (list
            (function
             (lambda ()
-              (let ((wl-draft-config-exec-flag config-exec-flag))
+              (let ((wl-draft-config-exec-flag config-exec-flag)
+                    (wl-draft-parent-folder parent-folder))
+                (goto-char current-point)
                 (run-hooks 'wl-draft-send-hook)
                 (setq recipients-message
                       (condition-case err
@@ -215,11 +225,12 @@ By setting following-method as yank-content."
     (while (file-directory-p filename)
       (setq filename (read-file-name "Please set filename (not directory): "
                                     filename)))
-    (if (file-exists-p filename)
-       (or (yes-or-no-p (format "File %s exists. Save anyway? " filename))
-           (error "Not saved")))
-    (setq wl-mime-save-directory (file-name-directory filename))
-    (mime-write-entity-content entity filename)))
+    (if (and (file-exists-p filename)
+            (not (yes-or-no-p (format "File %s exists. Save anyway? "
+                                      filename))))
+       (message "Not saved")
+      (setq wl-mime-save-directory (file-name-directory filename))
+      (mime-write-entity-content entity filename))))
 
 ;;; Yet another combine method.
 (defun wl-mime-combine-message/partial-pieces (entity situation)