X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=wl%2Fwl-mime.el;h=0a80534c3a28935672e5a4f1de68815b862892ac;hb=167053919d525e30162c34e574b6452bb858211b;hp=6eee49d83db19d95f991859dae4c50805a6cee0f;hpb=b0984f062f07e5236a8832b95c33166fb5537f98;p=elisp%2Fwanderlust.git diff --git a/wl/wl-mime.el b/wl/wl-mime.el index 6eee49d..0a80534 100644 --- a/wl/wl-mime.el +++ b/wl/wl-mime.el @@ -1,4 +1,4 @@ -;;; wl-mime.el -- SEMI implementations of MIME processing on Wanderlust. +;;; wl-mime.el --- SEMI implementations of MIME processing on Wanderlust. ;; Copyright (C) 1998,1999,2000 Yuuichi Teranishi @@ -24,15 +24,15 @@ ;; ;;; Commentary: -;; +;; ;;; Code: -;; +;; (require 'mime-view) (require 'mime-edit) (require 'mime-play) -(require 'mmelmo) +(require 'elmo) (eval-when-compile (defalias-maybe 'Meadow-version 'ignore)) @@ -54,10 +54,10 @@ By setting following-method as yank-content." (let ((wl-draft-buffer (current-buffer)) (mime-view-following-method-alist - (list (cons 'mmelmo-original-mode + (list (cons 'wl-original-message-mode (function wl-draft-yank-to-draft-buffer)))) (mime-preview-following-method-alist - (list (cons 'mmelmo-original-mode + (list (cons 'wl-original-message-mode (function wl-draft-yank-to-draft-buffer))))) (if (get-buffer (wl-current-message-buffer)) (save-excursion @@ -72,28 +72,43 @@ By setting following-method as yank-content." "" (interactive) (let* (recipients-message + (config-exec-flag wl-draft-config-exec-flag) (mime-display-header-hook 'wl-highlight-headers) - mime-view-ignored-field-list ; all header. + (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 - '((lambda () - (setq recipients-message - (concat "Recipients: " - (mapconcat - 'identity - (wl-draft-deduce-address-list - (current-buffer) - (point-min) - (save-excursion - (goto-char (point-min)) - (re-search-forward - (concat "^" - (regexp-quote mail-header-separator) - "$") - nil t) - (point))) - ", "))) - (run-hooks 'wl-draft-send-hook))) + (list + (function + (lambda () + (let ((wl-draft-config-exec-flag config-exec-flag)) + (run-hooks 'wl-draft-send-hook) + (setq recipients-message + (condition-case err + (concat "Recipients: " + (mapconcat + 'identity + (wl-draft-deduce-address-list + (current-buffer) + (point-min) + (save-excursion + (goto-char (point-min)) + (re-search-forward + (concat + "^" + (regexp-quote mail-header-separator) + "$") + nil t) + (point))) + ", ")) + (error + (kill-buffer (current-buffer)) + (signal (car err) (cdr err))))))))) mime-edit-translate-buffer-hook))) (mime-edit-preview-message) (let ((buffer-read-only nil)) @@ -130,84 +145,88 @@ By setting following-method as yank-content." (defun wl-message-request-partial (folder number) (elmo-set-work-buf - (elmo-read-msg-no-cache folder number (current-buffer)) -;;;(mime-parse-buffer nil 'mime-buffer-entity) + (elmo-message-fetch (wl-folder-get-elmo-folder folder) + number + (elmo-make-fetch-strategy 'entire) + nil + (current-buffer) + 'unread) (mime-parse-buffer nil))) -(defalias 'wl-message-read 'mime-preview-scroll-up-entity) -(defalias 'wl-message-next-content 'mime-preview-move-to-next) -(defalias 'wl-message-prev-content 'mime-preview-move-to-previous) -(defalias 'wl-message-play-content 'mime-preview-play-current-entity) -(defalias 'wl-message-extract-content 'mime-preview-extract-current-entity) -(defalias 'wl-message-quit 'mime-preview-quit) +(defalias 'wl-message-read 'mime-preview-scroll-up-entity) +(defalias 'wl-message-next-content 'mime-preview-move-to-next) +(defalias 'wl-message-prev-content 'mime-preview-move-to-previous) +(defalias 'wl-message-play-content 'mime-preview-play-current-entity) +(defalias 'wl-message-extract-content 'mime-preview-extract-current-entity) +(defalias 'wl-message-quit 'mime-preview-quit) (defalias 'wl-message-button-dispatcher-internal 'mime-button-dispatcher) ;;; Summary -(defun wl-summary-burst-subr (children target number) +(defun wl-summary-burst-subr (message-entity target number) ;; returns new number. - (let (content-type message-entity granch) - (while children - (setq content-type (mime-entity-content-type (car children))) - (if (eq (cdr (assq 'type content-type)) 'multipart) - (setq number (wl-summary-burst-subr - (mime-entity-children (car children)) - target - number)) - (when (and (eq (cdr (assq 'type content-type)) 'message) - (eq (cdr (assq 'subtype content-type)) 'rfc822)) - (message (format "Bursting...%s" (setq number (+ 1 number)))) - (setq message-entity - (car (mime-entity-children (car children)))) - (elmo-append-msg target - (mime-entity-body (car children)) - (mime-entity-fetch-field message-entity - "Message-ID")))) - (setq children (cdr children))) + (let (content-type entity) + (setq content-type (mime-entity-content-type message-entity)) + (cond ((eq (cdr (assq 'type content-type)) 'multipart) + (dolist (entity (mime-entity-children message-entity)) + (setq number (wl-summary-burst-subr + entity + target + number)))) + ((and (eq (cdr (assq 'type content-type)) 'message) + (eq (cdr (assq 'subtype content-type)) 'rfc822)) + (message "Bursting...%s" (setq number (+ 1 number))) + (setq entity + (car (mime-entity-children message-entity))) + (with-temp-buffer + (insert (mime-entity-body message-entity)) + (elmo-folder-append-buffer + target + (mime-entity-fetch-field entity "Message-ID"))))) number)) (defun wl-summary-burst () "" (interactive) - (let ((raw-buf (wl-message-get-original-buffer)) + (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-folder-name) + (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"))) (wl-summary-set-message-buffer-or-redisplay) - (save-excursion - (set-buffer (get-buffer wl-message-buf-name)) + (with-current-buffer view-buf (setq message-entity (get-text-property (point-min) 'mime-view-entity))) - (set-buffer raw-buf) - (setq children (mime-entity-children message-entity)) - (when children + (when message-entity (message "Bursting...") - (wl-summary-burst-subr children target 0) + (with-current-buffer raw-buf + (wl-summary-burst-subr message-entity target 0)) (message "Bursting...done")) (if (elmo-folder-plugged-p target) - (elmo-commit target))) - (wl-summary-sync-update3))) + (elmo-folder-check target))) + (wl-summary-sync-update))) ;; internal variable. -(defvar wl-mime-save-dir nil "Last saved directory.") +(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-dir - wl-tmp-dir))))) + (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))) - (if (file-exists-p filename) - (or (yes-or-no-p (format "File %s exists. Save anyway? " filename)) - (error "Not saved"))) - (setq wl-mime-save-dir (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) @@ -215,22 +234,32 @@ By setting following-method as yank-content." (interactive) (let* ((msgdb (save-excursion (set-buffer wl-message-buffer-cur-summary-buffer) - wl-summary-buffer-msgdb)) + (wl-summary-buffer-msgdb))) (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) subject-id overviews (root-dir (expand-file-name (concat "m-prts-" (user-login-name)) temporary-file-directory)) - full-file) + full-file point) (setq root-dir (concat root-dir "/" (replace-as-filename id))) (setq full-file (concat root-dir "/FULL")) (if (or (file-exists-p full-file) (not (y-or-n-p "Merge partials? "))) (with-current-buffer mother - (mime-store-message/partial-piece entity situation)) + (mime-store-message/partial-piece entity situation) + (setq wl-message-buffer-cur-summary-buffer summary-buf) + (make-variable-buffer-local 'mime-preview-over-to-next-method-alist) + (setq mime-preview-over-to-next-method-alist + (cons (cons 'mime-show-message-mode 'wl-message-exit) + mime-preview-over-to-next-method-alist)) + (make-variable-buffer-local 'mime-preview-over-to-previous-method-alist) + (setq mime-preview-over-to-previous-method-alist + (cons (cons 'mime-show-message-mode 'wl-message-exit) + mime-preview-over-to-previous-method-alist))) (setq subject-id (eword-decode-string (decode-mime-charset-string @@ -248,7 +277,8 @@ By setting following-method as yank-content." ;; request message at the cursor in Subject buffer. (wl-message-request-partial folder - (elmo-msgdb-overview-entity-get-number (car overviews)))) + (elmo-msgdb-overview-entity-get-number + (car overviews)))) (situation (mime-entity-situation message)) (the-id (or (cdr (assoc "id" situation)) ""))) (when (string= (downcase the-id) @@ -260,44 +290,60 @@ By setting following-method as yank-content." (setq overviews (cdr overviews))) (message "Not all partials found."))))) -(defun wl-mime-header-presentation-method (entity situation) - (let ((mmelmo-sort-field-list wl-message-sort-field-list)) - (mime-insert-header entity - wl-message-ignored-field-list - wl-message-visible-field-list) +(defun wl-mime-display-text/plain (entity situation) + (let ((beg (point))) + (mime-display-text/plain entity situation) + (wl-highlight-message beg (point-max) t t))) + +(defun wl-mime-display-header (entity situation) + (let ((elmo-message-ignored-field-list + (if wl-message-buffer-all-header-flag + nil + wl-message-ignored-field-list)) + (elmo-message-visible-field-list wl-message-visible-field-list) + (elmo-message-sorted-field-list wl-message-sort-field-list)) + (elmo-mime-insert-header entity situation) (wl-highlight-headers))) ;;; Setup methods. (defun wl-mime-setup () (set-alist 'mime-preview-quitting-method-alist - 'mmelmo-original-mode 'wl-message-exit) + 'wl-original-message-mode 'wl-message-exit) (set-alist 'mime-view-over-to-previous-method-alist - 'mmelmo-original-mode 'wl-message-exit) + 'wl-original-message-mode 'wl-message-exit) (set-alist 'mime-view-over-to-next-method-alist - 'mmelmo-original-mode 'wl-message-exit) + 'wl-original-message-mode 'wl-message-exit) (set-alist 'mime-preview-over-to-previous-method-alist - 'mmelmo-original-mode 'wl-message-exit) + 'wl-original-message-mode 'wl-message-exit) (set-alist 'mime-preview-over-to-next-method-alist - 'mmelmo-original-mode 'wl-message-exit) + 'wl-original-message-mode 'wl-message-exit) (add-hook 'wl-summary-redisplay-hook 'wl-message-delete-mime-out-buf) (add-hook 'wl-message-exit-hook 'wl-message-delete-mime-out-buf) (ctree-set-calist-strictly + 'mime-preview-condition + '((type . text) (subtype . plain) + (body . visible) + (body-presentation-method . wl-mime-display-text/plain) + (major-mode . wl-original-message-mode))) + + (ctree-set-calist-strictly 'mime-acting-condition '((type . message) (subtype . partial) (method . wl-mime-combine-message/partial-pieces) (request-partial-message-method . wl-message-request-partial) - (major-mode . mmelmo-original-mode))) + (major-mode . wl-original-message-mode))) + (ctree-set-calist-strictly 'mime-acting-condition '((mode . "extract") - (major-mode . mmelmo-original-mode) + (major-mode . wl-original-message-mode) (method . wl-mime-save-content))) (set-alist 'mime-preview-following-method-alist - 'mmelmo-original-mode + 'wl-original-message-mode (function wl-message-follow-current-entity)) (set-alist 'mime-view-following-method-alist - 'mmelmo-original-mode + 'wl-original-message-mode (function wl-message-follow-current-entity)) (set-alist 'mime-edit-message-inserter-alist 'wl-draft-mode (function wl-draft-insert-current-message)) @@ -307,7 +353,7 @@ By setting following-method as yank-content." 'wl-draft-mode (cdr (assq 'mail-mode mime-edit-split-message-sender-alist))) (set-alist 'mime-raw-representation-type-alist - 'mmelmo-original-mode 'binary) + 'wl-original-message-mode 'binary) ;; Sort and highlight header fields. (or wl-message-ignored-field-list (setq wl-message-ignored-field-list @@ -316,10 +362,14 @@ By setting following-method as yank-content." (setq wl-message-visible-field-list mime-view-visible-field-list)) (set-alist 'mime-header-presentation-method-alist - 'mmelmo-original-mode - (function wl-mime-header-presentation-method)) - (add-hook 'mmelmo-entity-content-inserted-hook 'wl-highlight-body)) - + 'wl-original-message-mode + 'wl-mime-display-header) + ;; To avoid overriding wl-draft-mode-map. + (when (boundp 'mime-setup-signature-key-alist) + (unless (assq 'wl-draft-mode mime-setup-signature-key-alist) + (setq mime-setup-signature-key-alist + (cons '(wl-draft-mode . "\C-c\C-w") + mime-setup-signature-key-alist))))) (require 'product) (product-provide (provide 'wl-mime) (require 'wl-version))