* wl-mime.el (wl-message-delete-current-part): New function.
[elisp/wanderlust.git] / wl / wl-mime.el
index 3c5cd88..3dfa7bb 100644 (file)
@@ -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
@@ -156,6 +166,52 @@ By setting following-method as yank-content."
 (defalias 'wl-message-button-dispatcher-internal
   'mime-button-dispatcher)
 
+(defsubst wl-mime-node-id-to-string (node-id)
+  (if (consp node-id)
+      (mapconcat (function (lambda (num) (format "%s" (1+ num))))
+                (reverse node-id)
+                ".")
+    "0"))
+
+(defun wl-message-delete-current-part ()
+  "Delete a part under the cursor from the multipart message."
+  (interactive)
+  (let* ((entity (get-text-property (point) 'mime-view-entity))
+        (node-id (mime-entity-node-id entity))
+        (header-start (mime-buffer-entity-header-start-internal entity))
+        (body-end (mime-buffer-entity-body-end-internal entity))
+        (folder (wl-folder-get-elmo-folder wl-message-buffer-cur-folder))
+        (number wl-message-buffer-cur-number)
+        (msgid (elmo-message-field folder number 'message-id)))
+    (when (and node-id
+              (yes-or-no-p
+               (format "Do you really want to delete part %s? "
+                       (wl-mime-node-id-to-string node-id))))
+      (with-temp-buffer
+       (elmo-message-fetch folder
+                           number
+                           (elmo-make-fetch-strategy 'entire)
+                           nil
+                           (current-buffer)
+                           'unread)
+       (kill-region header-start body-end)
+       (goto-char header-start)
+       (insert "Content-Type: text/plain; charset=US-ASCII\n\n")
+       (insert "** This part has been removed by Wanderlust **\n\n")
+       (elmo-folder-append-buffer folder t))
+
+      (elmo-folder-append-messages
+       (wl-folder-get-elmo-folder wl-trash-folder)
+       folder (list number) nil)
+      (elmo-folder-delete-messages folder (list number))
+
+      (when (file-exists-p (elmo-cache-get-path msgid))
+       (delete-file (elmo-cache-get-path msgid)))
+
+      (mime-preview-quit)
+      (wl-summary-toggle-disp-msg 'off)
+      (wl-summary-sync nil "update"))))
+
 ;;; Summary
 (defun wl-summary-burst-subr (message-entity target number)
   ;; returns new number.
@@ -179,17 +235,18 @@ By setting following-method as yank-content."
              (mime-entity-fetch-field entity "Message-ID")))))
     number))
 
-(defun wl-summary-burst ()
-  ""
-  (interactive)
+(defun wl-summary-burst (&optional arg)
+  "De-capsulate embedded messages in MIME format.
+With ARG, ask destination folder."
+  (interactive "P")
   (let ((raw-buf (wl-summary-get-original-buffer))
        (view-buf wl-message-buffer)
        children message-entity content-type target)
     (save-excursion
       (setq target wl-summary-buffer-elmo-folder)
-      (while (not (elmo-folder-writable-p target))
-       (setq target
-             (wl-summary-read-folder wl-default-folder "to extract to")))
+      (when (or arg (not (elmo-folder-writable-p target)))
+       (let ((fld (wl-summary-read-folder wl-default-folder "to extract to")))
+         (setq target (wl-folder-get-elmo-folder fld))))
       (wl-summary-set-message-buffer-or-redisplay)
       (with-current-buffer view-buf
        (setq message-entity (get-text-property (point-min) 'mime-view-entity)))
@@ -215,11 +272,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)
@@ -298,6 +356,14 @@ By setting following-method as yank-content."
     (elmo-mime-insert-header entity situation)
     (wl-highlight-headers)))
 
+(defun wl-mime-decrypt-application/pgp-encrypted (entity situation)
+  (let ((summary-buffer wl-message-buffer-cur-summary-buffer)
+       (original-buffer wl-message-buffer-original-buffer))
+    (mime-decrypt-application/pgp-encrypted entity situation)
+    (setq wl-message-buffer-cur-summary-buffer summary-buffer)
+    (setq wl-message-buffer-original-buffer original-buffer)))
+   
+
 ;;; Setup methods.
 (defun wl-mime-setup ()
   (set-alist 'mime-preview-quitting-method-alist
@@ -329,6 +395,12 @@ By setting following-method as yank-content."
 
   (ctree-set-calist-strictly
    'mime-acting-condition
+   '((type . application) (subtype . pgp-encrypted)
+     (method . wl-mime-decrypt-application/pgp-encrypted)
+     (major-mode . wl-original-message-mode)))
+
+  (ctree-set-calist-strictly
+   'mime-acting-condition
    '((mode . "extract")
      (major-mode . wl-original-message-mode)
      (method . wl-mime-save-content)))