* elmo-mime.el (elmo-mime-display-as-is-internal): Insert decoded

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

diff --git a/wl/wl-mime.el b/wl/wl-mime.el
index b5afd55..cde2156 100644 (file)
--- a/wl/wl-mime.el
+++ b/wl/wl-mime.el
@@ -68,12 +68,46 @@ has Non-nil value\)"
          (set-buffer message-buffer)
          (save-restriction
            (widen)
-           (if (wl-region-exists-p)
-               (wl-mime-preview-follow-current-region)
-             (mime-preview-follow-current-entity))))
+           (cond
+            ((wl-region-exists-p)
+             (wl-mime-preview-follow-current-region))
+            ((get-text-property (point-min) 'mime-view-entity)
+             (mime-preview-follow-current-entity))
+            (t
+             (wl-mime-preview-follow-no-mime)))))
       (error "No message."))))
 
 ;; modified mime-preview-follow-current-entity from mime-view.el
+(defun wl-mime-preview-follow-no-mime ()
+  "Write follow message to current message, without mime.
+It calls following-method selected from variable
+`mime-preview-following-method-alist'."
+  (interactive)
+  (let* ((mode (mime-preview-original-major-mode 'recursive))
+        (new-name (format "%s-no-mime" (buffer-name)))
+        new-buf beg end
+        (entity (get-text-property (point-min) 'elmo-as-is-entity))
+        (the-buf (current-buffer))
+        fields)
+    (save-excursion
+      (goto-char (point-min))
+      (setq beg (re-search-forward "^$" nil t)
+           end (point-max)))
+    (save-excursion
+      (set-buffer (setq new-buf (get-buffer-create new-name)))
+      (erase-buffer)
+      (insert-buffer-substring the-buf beg end)
+      (goto-char (point-min))
+      ;; Insert all headers.
+      (mime-insert-header entity)
+      (let ((f (cdr (assq mode mime-preview-following-method-alist))))
+       (if (functionp f)
+           (funcall f new-buf)
+         (message
+          "Sorry, following method for %s is not implemented yet."
+          mode))))))
+
+;; modified mime-preview-follow-current-entity from mime-view.el
 (defun wl-mime-preview-follow-current-region ()
   "Write follow message to current region.
 It calls following-method selected from variable
@@ -110,8 +144,7 @@ It calls following-method selected from variable
                        (mime-insert-header current-entity fields)
                        t))
            (setq fields (std11-collect-field-names)
-                 current-entity (mime-entity-parent current-entity))
-           ))
+                 current-entity (mime-entity-parent current-entity))))
        (let ((rest mime-view-following-required-fields-list)
              field-name ret)
          (while rest
@@ -129,19 +162,14 @@ It calls following-method selected from variable
                                                   entity field-name))))
                        (setq entity (mime-entity-parent entity)))))
                  (if ret
-                     (insert (concat field-name ": " ret "\n"))
-                   )))
-           (setq rest (cdr rest))
-           ))
-       )
+                     (insert (concat field-name ": " ret "\n")))))
+           (setq rest (cdr rest)))))
       (let ((f (cdr (assq mode mime-preview-following-method-alist))))
        (if (functionp f)
            (funcall f new-buf)
          (message
           "Sorry, following method for %s is not implemented yet."
-          mode)
-         ))
-      )))
+          mode))))))
 
 (defalias 'wl-draft-enclose-digest-region 'mime-edit-enclose-digest-region)