-;;; wl-mime.el -- SEMI implementations of MIME processing on Wanderlust.
+;;; wl-mime.el --- SEMI implementations of MIME processing on Wanderlust.
-;; Copyright 1998,1999,2000 Yuuichi Teranishi <teranisi@gohome.org>
+;; Copyright (C) 1998,1999,2000 Yuuichi Teranishi <teranisi@gohome.org>
;; Author: Yuuichi Teranishi <teranisi@gohome.org>
;; Keywords: mail, net news
-;; Time-stamp: <2000-04-10 23:49:34 teranisi>
;; This file is part of Wanderlust (Yet Another Message Interface on Emacsen).
;;
;;; Commentary:
-;;
+;;
;;; Code:
-;;
+;;
(require 'mime-view)
(require 'mime-edit)
(require 'mime-play)
-(require 'mmelmo)
+(require 'elmo)
(eval-when-compile
- (defun-maybe Meadow-version ())
- (mapcar
- (function
- (lambda (symbol)
- (unless (boundp symbol)
- (set (make-local-variable symbol) nil))))
- '(xemacs-betaname
- xemacs-codename
- enable-multibyte-characters
- mule-version)))
+ (defalias-maybe 'pgg-decrypt-region 'ignore)
+ (defalias-maybe 'pgg-display-output-buffer 'ignore)
+ (defalias-maybe 'pgg-verify-region 'ignore))
;;; Draft
(defalias 'wl-draft-editor-mode 'mime-edit-mode)
-(defalias 'wl-draft-decode-message-in-buffer
+(defalias 'wl-draft-decode-message-in-buffer
'mime-edit-decode-message-in-buffer)
(defun wl-draft-yank-current-message-entity ()
- "Yank currently displayed message entity.
-By setting following-method as yank-content."
+ "Yank currently displayed message entity.
+By setting following-method as yank-content.
+
+If region is active, yank region contents instead. \(this feature is available
+if and only if `transient-mark-mode' \(GNU Emacs\) or `zmacs-regions' \(XEmacs\)
+has Non-nil value\)"
(let ((wl-draft-buffer (current-buffer))
- (mime-view-following-method-alist
- (list (cons 'mmelmo-original-mode
+ (mime-view-following-method-alist
+ (list (cons 'wl-original-message-mode
(function wl-draft-yank-to-draft-buffer))))
- (mime-preview-following-method-alist
- (list (cons 'mmelmo-original-mode
+ (mime-preview-following-method-alist
+ (list (cons 'wl-original-message-mode
(function wl-draft-yank-to-draft-buffer)))))
(if (get-buffer (wl-current-message-buffer))
(save-excursion
+ (set-buffer (wl-current-message-buffer))
(save-restriction
- (set-buffer (wl-current-message-buffer))
(widen)
- (mime-preview-follow-current-entity))))))
+ (if (wl-region-exists-p)
+ (wl-mime-preview-follow-current-region)
+ (mime-preview-follow-current-entity)))))))
+
+;; 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
+`mime-preview-following-method-alist'."
+ (interactive)
+ (let ((r-beg (region-beginning))
+ (r-end (region-end))
+ (entity (get-text-property (point-min)
+ 'mime-view-entity)))
+ (let* ((mode (mime-preview-original-major-mode 'recursive))
+ (new-name
+ (format "%s-active-region" (buffer-name)))
+ new-buf
+ (the-buf (current-buffer))
+ fields)
+ (save-excursion
+ (set-buffer (setq new-buf (get-buffer-create new-name)))
+ (erase-buffer)
+ (insert ?\n)
+ (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)
+ (eq (mime-entity-media-subtype entity) 'rfc822))
+ (car (mime-entity-children entity))
+ entity)))
+ (while (and current-entity
+ (if (and (eq (mime-entity-media-type
+ current-entity) 'message)
+ (eq (mime-entity-media-subtype
+ current-entity) 'rfc822))
+ nil
+ (mime-insert-header current-entity fields)
+ t))
+ (setq fields (std11-collect-field-names)
+ current-entity (mime-entity-parent current-entity))
+ ))
+ (let ((rest mime-view-following-required-fields-list)
+ field-name ret)
+ (while rest
+ (setq field-name (car rest))
+ (or (std11-field-body field-name)
+ (progn
+ (save-excursion
+ (set-buffer the-buf)
+ (let ((entity (when mime-mother-buffer
+ (set-buffer mime-mother-buffer)
+ (get-text-property (point)
+ 'mime-view-entity))))
+ (while (and entity
+ (null (setq ret (mime-entity-fetch-field
+ entity field-name))))
+ (setq entity (mime-entity-parent entity)))))
+ (if ret
+ (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
+ (format
+ "Sorry, following method for %s is not implemented yet."
+ mode))
+ ))
+ )))
(defalias 'wl-draft-enclose-digest-region 'mime-edit-enclose-digest-region)
-;; SEMI 1.13.5 or later.
-;; (mime-display-message
-;; MESSAGE &optional
-;; PREVIEW-BUFFER MOTHER DEFAULT-KEYMAP-OR-FUNCTION ORIGINAL-MAJOR-MODE)
-;; SEMI 1.13.4 or earlier.
-;; (mime-display-message
-;; MESSAGE &optional
-;; PREVIEW-BUFFER MOTHER DEFAULT-KEYMAP-OR-FUNCTION)
-(static-if (or (and mime-user-interface-product
- (eq (nth 0 (aref mime-user-interface-product 1)) 1)
- (>= (nth 1 (aref mime-user-interface-product 1)) 14))
- (and mime-user-interface-product
- (eq (nth 0 (aref mime-user-interface-product 1)) 1)
- (eq (nth 1 (aref mime-user-interface-product 1)) 13)
- (>= (nth 2 (aref mime-user-interface-product 1)) 5)))
- ;; Has original-major-mode optional argument.
- (defalias 'wl-mime-display-message 'mime-display-message)
- (defmacro wl-mime-display-message (message &optional
- preview-buffer mother
- default-keymap-or-function
- original-major-mode)
- (` (mime-display-message (, message) (, preview-buffer) (, mother)
- (, default-keymap-or-function))))
- ;; User agent field of XEmacs has problem on SEMI 1.13.4 or earlier.
- (setq mime-edit-user-agent-value
- (concat
- (mime-product-name mime-user-interface-product) "/"
- (mapconcat
- #'number-to-string
- (mime-product-version mime-user-interface-product) ".")
- " (" (mime-product-code-name mime-user-interface-product)
- ") " (mime-product-name mime-library-product)
- "/" (mapconcat #'number-to-string
- (mime-product-version mime-library-product) ".")
- " (" (mime-product-code-name mime-library-product) ") "
- (if (featurep 'xemacs)
- (concat
- (if (featurep 'mule) "MULE")
- " XEmacs"
- (if (string-match "\\s +\\((\\|\\\"\\)" emacs-version)
- (concat "/" (substring emacs-version 0
- (match-beginning 0))
- (if (and (boundp 'xemacs-betaname)
- ;; It does not exist in XEmacs
- ;; versions prior to 20.3.
- xemacs-betaname)
- (concat " " xemacs-betaname)
- "")
- " (" xemacs-codename ") ("
- system-configuration ")")
- " (" emacs-version ")"))
- (let ((ver (if (string-match "\\.[0-9]+$" emacs-version)
- (substring emacs-version 0 (match-beginning 0))
- emacs-version)))
- (if (featurep 'mule)
- (if (boundp 'enable-multibyte-characters)
- (concat "Emacs/" ver
- " (" system-configuration ")"
- (if enable-multibyte-characters
- (concat " MULE/" mule-version)
- " (with unibyte mode)")
- (if (featurep 'meadow)
- (let ((mver (Meadow-version)))
- (if (string-match "^Meadow-" mver)
- (concat " Meadow/"
- (substring mver
- (match-end 0)))))))
- (concat "MULE/" mule-version
- " (based on Emacs " ver ")"))
- (concat "Emacs/" ver " (" system-configuration ")")))))))
-
-;; FLIM 1.12.7
-;; (mime-read-field FIELD-NAME &optional ENTITY)
-;; FLIM 1.13.2 or later
-;; (mime-entity-read-field ENTITY FIELD-NAME)
-(static-if (fboundp 'mime-entity-read-field)
- (defalias 'wl-mime-entity-read-field 'mime-entity-read-field)
- (defmacro wl-mime-entity-read-field (entity field-name)
- (` (mime-read-field (, field-name) (, entity)))))
-
(defun wl-draft-preview-message ()
+ "Preview editing message."
(interactive)
- (let ((mime-display-header-hook 'wl-highlight-headers)
- mime-view-ignored-field-list ; all header.
- (mime-edit-translate-buffer-hook (append
- (list 'wl-draft-config-exec)
- mime-edit-translate-buffer-hook)))
+ (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)
+ (wl-draft-parent-folder parent-folder))
+ (goto-char current-point)
+ (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))
- (when wl-highlight-body-too
+ (when wl-highlight-body-too
(wl-highlight-body))
- (run-hooks 'wl-draft-preview-message-hook))))
+ (run-hooks 'wl-draft-preview-message-hook))
+ (message recipients-message)))
(defalias 'wl-draft-caesar-region 'mule-caesar-region)
(if (setq mime-out-win (get-buffer-window mime-out-buf))
(delete-window mime-out-win)))))
-(defun wl-message-request-partial (folder number msgdb)
+(defun wl-message-request-partial (folder number)
(elmo-set-work-buf
- (elmo-read-msg-no-cache folder number (current-buffer) msgdb)
- (mime-parse-buffer nil))); 'mime-buffer-entity)))
-
-(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 'mime-button-dispatcher)
+ (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-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)
+ (save-restriction
+ (widen)
+ (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))
+ (orig-buf wl-message-buffer-original-buffer))
+ (if (eq (luna-class-name entity) 'mime-elmo-imap-entity)
+ (error "Please fetch the entire message (by typing 'C-u .') and try again"))
+ (with-current-buffer orig-buf
+ (unless (string-equal
+ (buffer-string)
+ (elmo-message-fetch folder number
+ (elmo-make-fetch-strategy 'entire)))
+ (error "Buffer content differs from actual message")))
+ (when (and (elmo-folder-writable-p folder)
+ (buffer-live-p orig-buf)
+ 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
+ (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 "** 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")))))
+
+(defun wl-message-decrypt-pgp-nonmime ()
+ "Decrypt PGP encrypted region"
+ (interactive)
+ (require 'pgg)
+ (save-excursion
+ (beginning-of-line)
+ (if (or (re-search-forward "^-+END PGP MESSAGE-+$" nil t)
+ (re-search-backward "^-+END PGP MESSAGE-+$" nil t))
+ (let (beg end status)
+ (setq end (match-end 0))
+ (if (setq beg (re-search-backward "^-+BEGIN PGP MESSAGE-+$" nil t))
+ (let ((inhibit-read-only t)
+ (buffer-file-coding-system wl-cs-autoconv))
+ (setq status (pgg-decrypt-region beg end))
+ (pgg-display-output-buffer beg end status))
+ (message "Cannot find pgp encrypted region")))
+ (message "Cannot find pgp encrypted region"))))
+
+(defun wl-message-verify-pgp-nonmime ()
+ "Verify PGP signed region"
+ (interactive)
+ (require 'pgg)
+ (save-excursion
+ (beginning-of-line)
+ (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* ((beg (point))
+ (situation (mime-preview-find-boundary-info))
+ (p-end (aref situation 1))
+ (entity (aref situation 2))
+ (count 0))
+ (goto-char p-end)
+ (while (< beg (point))
+ (if (re-search-backward "^-+BEGIN PGP SIGNED MESSAGE-+$" nil t)
+ (setq count (+ count 1))
+ (debug)))
+ (with-temp-buffer
+ (set-buffer-multibyte nil)
+ (insert (mime-entity-body entity))
+ (goto-char (point-max))
+ (while (> count 0)
+ (if (re-search-backward "^-+BEGIN PGP SIGNED MESSAGE-+$" nil t)
+ (setq count (- count 1))
+ (debug)))
+ (let ((r-beg (point))
+ (r-end (re-search-forward "^-+END PGP SIGNATURE-+$" nil t)))
+ (if r-end
+ (setq status (pgg-verify-region r-beg r-end nil 'fetch))
+ (debug)))))
+ (mime-show-echo-buffer)
+ (set-buffer mime-echo-buffer-name)
+ (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))
+ (encode-coding-region m-beg (point) buffer-file-coding-system)
+ (decode-coding-region m-beg (point) wl-cs-autoconv))
+ (message "Cannot find pgp signed region"))))
+
+;; XXX: encrypted multipart isn't represented as multipart
+(defun wl-mime-preview-application/pgp (parent-entity entity situation)
+ (require 'pgg)
+ (goto-char (point-max))
+ (let ((p (point))
+ raw-buf to-buf representation-type child-entity)
+ (goto-char p)
+ (save-restriction
+ (narrow-to-region p p)
+ (setq to-buf (current-buffer))
+ (with-temp-buffer
+ (setq raw-buf (current-buffer))
+ (mime-insert-entity entity)
+ (when (progn
+ (goto-char (point-min))
+ (re-search-forward "^-+BEGIN PGP MESSAGE-+$" nil t))
+ (pgg-decrypt-region (point-min)(point-max))
+ (delete-region (point-min) (point-max))
+ (insert-buffer pgg-output-buffer)
+ (setq representation-type 'elmo-buffer))
+ (setq child-entity (mime-parse-message
+ (mm-expand-class-name representation-type)
+ nil
+ parent-entity
+ (mime-entity-node-id-internal parent-entity)))
+ (mime-display-entity
+ child-entity
+ nil
+ `((header . visible)
+ (body . visible)
+ (entity-button . invisible))
+ to-buf)))))
+
+(defun wl-mime-preview-application/pgp-encrypted (entity situation)
+ (let* ((entity-node-id (mime-entity-node-id entity))
+ (mother (mime-entity-parent entity))
+ (knum (car entity-node-id))
+ (onum (if (> knum 0)
+ (1- knum)
+ (1+ knum)))
+ (orig-entity (nth onum (mime-entity-children mother))))
+ (wl-mime-preview-application/pgp entity orig-entity situation)))
;;; 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))))
- (save-restriction
- (narrow-to-region (mime-entity-point-min message-entity)
- (mime-entity-point-max message-entity))
- (elmo-append-msg target
- ;;(mime-entity-content (car children))))
- (buffer-substring (point-min) (point-max))
- (std11-field-body "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))
+(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-folder-name)
- (while (not (elmo-folder-writable-p target))
- (setq target
- (wl-summary-read-folder wl-default-folder "to extract to")))
+ (setq target wl-summary-buffer-elmo-folder)
+ (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)
- (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)
- (message "Bursting...done."))
+ (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
+ (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)
- "Internal method for wl to combine message/partial messages
-automatically."
+ "Internal method for wl to combine message/partial messages automatically."
(interactive)
- (let* ((msgdb (save-excursion
+ (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?")))
+ (not (y-or-n-p "Merge partials? ")))
(with-current-buffer mother
- (mime-store-message/partial-piece entity situation))
- (setq subject-id
+ (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
- (wl-mime-entity-read-field entity 'Subject)
+ (decode-mime-charset-string
+ (mime-entity-read-field entity 'Subject)
wl-summary-buffer-mime-charset)))
(if (string-match "[0-9\n]+" subject-id)
(setq subject-id (substring subject-id 0 (match-beginning 0))))
;; request message at the cursor in Subject buffer.
(wl-message-request-partial
folder
- (elmo-msgdb-overview-entity-get-number (car overviews))
- msgdb))
+ (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)
+ (when (string= (downcase the-id)
(downcase id))
(with-current-buffer mother
(mime-store-message/partial-piece message situation))
(setq overviews (cdr overviews)))
(message "Not all partials found.")))))
+(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)))
+
+(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
- '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)
- (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-view-over-to-next-method-alist
+ '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-preview-condition
+ '((type . application)(subtype . pgp-encrypted)
+ (encoding . t)
+ (body . invisible)
+ (body-presentation-method . wl-mime-preview-application/pgp-encrypted)
+ (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
+ '((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 . mmelmo-original-mode)
+ (major-mode . wl-original-message-mode)
(method . wl-mime-save-content)))
- (set-alist 'mime-preview-following-method-alist
- 'mmelmo-original-mode
+ (set-alist 'mime-preview-following-method-alist
+ 'wl-original-message-mode
(function wl-message-follow-current-entity))
- (set-alist 'mime-view-following-method-alist
- 'mmelmo-original-mode
+ (set-alist 'mime-view-following-method-alist
+ '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))
(set-alist 'mime-edit-mail-inserter-alist
'wl-draft-mode (function wl-draft-insert-get-message))
(set-alist 'mime-edit-split-message-sender-alist
- 'wl-draft-mode
+ '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.
- (setq mmelmo-sort-field-list wl-message-sort-field-list)
- (add-hook 'mmelmo-header-inserted-hook 'wl-highlight-headers)
- (add-hook 'mmelmo-entity-content-inserted-hook 'wl-highlight-body))
-
-
-(provide 'wl-mime)
+ (or wl-message-ignored-field-list
+ (setq wl-message-ignored-field-list
+ mime-view-ignored-field-list))
+ (or wl-message-visible-field-list
+ (setq wl-message-visible-field-list
+ mime-view-visible-field-list))
+ (set-alist 'mime-header-presentation-method-alist
+ '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))
;;; wl-mime.el ends here
projects / elisp / wanderlust.git / blobdiff