(list (cons 'wl-original-message-mode
(function wl-draft-yank-to-draft-buffer))))
(message-buffer (wl-current-message-buffer)))
- (unless message-buffer
- (error "No message."))
- (if (get-buffer message-buffer)
+ (if message-buffer
(save-excursion
- (set-buffer (wl-current-message-buffer))
+ (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))
+ ((not (wl-message-mime-analysis-p
+ (wl-message-buffer-display-type)))
+ (wl-mime-preview-follow-no-mime
+ (wl-message-buffer-display-type)))
+ (t
+ (mime-preview-follow-current-entity)))))
+ (error "No message."))))
+
+;; modified mime-preview-follow-current-entity from mime-view.el
+(defun wl-mime-preview-follow-no-mime (display-type)
+ "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 min beg end
+ (entity (get-text-property (point-min) 'elmo-as-is-entity))
+ (the-buf (current-buffer))
+ fields)
+ (save-excursion
+ (goto-char (point-min))
+ (setq min (point-min)
+ 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.
+ (let ((elmo-mime-display-header-analysis
+ (wl-message-mime-analysis-p display-type 'header)))
+ (elmo-mime-insert-sorted-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 ()
(insert-buffer-substring the-buf r-beg r-end)
(goto-char (point-min))
(let ((current-entity
- (if (and (eq (mime-entity-media-type entity) 'message)
+ (if (and entity
+ (eq (mime-entity-media-type entity) 'message)
(eq (mime-entity-media-subtype entity) 'rfc822))
(car (mime-entity-children entity))
entity)))
(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
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)
((boundp attr)
(symbol-value attr)))))
+(defun wl-mime-quit-preview ()
+ "Quitting method for mime-view."
+ (let* ((temp (and (boundp 'mime-edit-temp-message-buffer) ;; for SEMI <= 1.14.6
+ mime-edit-temp-message-buffer))
+ (window (selected-window))
+ buf)
+ (mime-preview-kill-buffer)
+ (set-buffer temp)
+ (setq buf mime-edit-buffer)
+ (kill-buffer temp)
+ (select-window window)
+ (switch-to-buffer buf)))
+
(defun wl-draft-preview-message ()
"Preview editing message."
(interactive)
(signal (car err) (cdr err)))))))
mime-edit-translate-buffer-hook)))
(mime-edit-preview-message)
+ (make-local-variable 'mime-preview-quitting-method-alist)
+ (setq mime-preview-quitting-method-alist
+ '((mime-temp-message-mode . wl-mime-quit-preview)))
(let ((buffer-read-only nil))
(when wl-highlight-body-too
(wl-highlight-body))
(run-hooks 'wl-draft-preview-message-hook))
- (make-local-variable 'kill-buffer-hook)
+ (make-local-hook 'kill-buffer-hook)
(add-hook 'kill-buffer-hook
(lambda ()
(when (get-buffer-window
(delete-window))
(when (get-buffer wl-draft-preview-attributes-buffer-name)
(kill-buffer (get-buffer
- wl-draft-preview-attributes-buffer-name)))))
+ wl-draft-preview-attributes-buffer-name))))
+ nil t)
(if (not wl-draft-preview-attributes)
(message (concat "Recipients: "
- (cdr (assq 'reciepient attribute-list))))
+ (cdr (assq 'recipients attribute-list))))
(ignore-errors ; in case when the window is too small
(let* ((cur-win (selected-window))
(size (min
(erase-buffer)
(dolist (pair attribute-list)
(insert (capitalize (symbol-name (car pair))) ": "
- (or (cdr pair) "")
+ (format "%s" (or (cdr pair) ""))
"\n"))
(goto-char (point-min))
(wl-highlight-headers)))
(widen)
(let* ((entity (get-text-property (point) 'mime-view-entity))
(node-id (mime-entity-node-id entity))
+ (filename (mime-entity-safe-filename 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))
(insert-buffer orig-buf)
(delete-region header-start body-end)
(goto-char header-start)
- (insert "Content-Type: text/plain; charset=US-ASCII\n\n")
+ (insert "Content-Type: text/plain; charset=US-ASCII\n")
+ (when filename
+ (insert
+ "Content-Disposition:"
+ (mime-encode-field-body
+ (concat ""
+ (and filename
+ (concat " inline; filename=" (std11-wrap-as-quoted-string filename))))
+ "Content-Disposition")
+ "\n"))
+ (insert "\n")
(insert "** This part has been removed by Wanderlust **\n\n")
(elmo-folder-append-buffer folder))
(if (and (or (re-search-forward "^-+END PGP SIGNATURE-+$" nil t)
(re-search-backward "^-+END PGP SIGNATURE-+$" nil t))
(re-search-backward "^-+BEGIN PGP SIGNED MESSAGE-+$" nil t))
- (let (status m-beg)
+ (let (status)
(let* ((beg (point))
(situation (mime-preview-find-boundary-info))
(p-end (aref situation 1))
(set-window-start
(get-buffer-window mime-echo-buffer-name)
(point-max))
- (setq m-beg (point))
(insert-buffer-substring
- (if status pgg-output-buffer pgg-errors-buffer))
- (decode-coding-region m-beg (point) wl-cs-autoconv))
+ (if status pgg-output-buffer pgg-errors-buffer)))
(message "Cannot find pgp signed region"))))
;; XXX: encrypted multipart isn't represented as multipart
(interactive "P")
(let ((raw-buf (wl-summary-get-original-buffer))
(view-buf wl-message-buffer)
- children message-entity content-type target-name target)
+ message-entity target)
(save-excursion
- (setq target wl-summary-buffer-elmo-folder)
- (when (or arg (not (elmo-folder-writable-p target)))
- (setq target-name (wl-summary-read-folder wl-default-folder "to extract to"))
- (setq target (wl-folder-get-elmo-folder target-name)))
+ (when (and (null arg)
+ (elmo-folder-writable-p wl-summary-buffer-elmo-folder))
+ (setq target wl-summary-buffer-elmo-folder))
+ (while (null target)
+ (let ((name (wl-summary-read-folder wl-default-folder
+ "to extract to")))
+ (setq target (wl-folder-get-elmo-folder name))
+ (unless (elmo-folder-writable-p target)
+ (message "%s is not writable" name)
+ (setq target nil)
+ (sit-for 1))))
(wl-summary-set-message-buffer-or-redisplay)
(with-current-buffer view-buf
- (setq message-entity (get-text-property (point-min) 'mime-view-entity)))
+ (setq message-entity
+ (get-text-property (point-min) 'mime-view-entity)))
(when message-entity
(message "Bursting...")
(with-current-buffer raw-buf
(message "Bursting...done"))
(if (elmo-folder-plugged-p target)
(elmo-folder-check target)))
- (when (or (not target-name)
- (string= wl-summary-buffer-folder-name target-name))
+ (when (and target
+ (string= wl-summary-buffer-folder-name
+ (elmo-folder-name-internal target)))
(save-excursion (wl-summary-sync-update)))))
;; internal variable.
(defvar wl-mime-save-directory nil "Last saved directory.")
;;; Yet another save method.
(defun wl-mime-save-content (entity situation)
- (let ((filename (read-file-name "Save to file: "
- (expand-file-name
- (or (mime-entity-safe-filename entity)
- ".")
- (or wl-mime-save-directory
- wl-temporary-file-directory)))))
+ (let ((filename (expand-file-name
+ (read-file-name "Save to file: "
+ (expand-file-name
+ (or (mime-entity-safe-filename entity)
+ ".")
+ (or wl-mime-save-directory
+ wl-temporary-file-directory))))))
(while (file-directory-p filename)
(setq filename (read-file-name "Please set filename (not directory): "
filename)))
(defun wl-mime-combine-message/partial-pieces (entity situation)
"Internal method for wl to combine message/partial messages automatically."
(interactive)
- (let* ((folder (save-excursion
- (set-buffer wl-message-buffer-cur-summary-buffer)
+ (let* ((folder (with-current-buffer wl-message-buffer-cur-summary-buffer
wl-summary-buffer-elmo-folder))
(mime-display-header-hook 'wl-highlight-headers)
- (folder wl-message-buffer-cur-folder)
(id (or (cdr (assoc "id" situation)) ""))
(mother (current-buffer))
(summary-buf wl-message-buffer-cur-summary-buffer)
(elmo-folder-do-each-message-entity (entity folder)
(when (string-match
(regexp-quote subject-id)
- (elmo-message-entity-field entity 'subject))
+ (elmo-message-entity-field entity 'subject 'decode))
(let* ((message
;; request message at the cursor in Subject buffer.
(wl-message-request-partial
- folder
+ (elmo-folder-name-internal folder)
(elmo-message-entity-number entity)))
(situation (mime-entity-situation message))
(the-id (or (cdr (assoc "id" situation)) "")))
(defun wl-mime-display-header (entity situation)
(let ((elmo-message-ignored-field-list
- (if wl-message-buffer-all-header-flag
+ (if wl-message-buffer-require-all-header
nil
wl-message-ignored-field-list))
(elmo-message-visible-field-list wl-message-visible-field-list)
(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 ()
projects / elisp / wanderlust.git / blobdiff