;;; 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).
(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 'Meadow-version 'ignore))
+
+(defvar xemacs-betaname)
+(defvar xemacs-codename)
+(defvar enable-multibyte-characters)
+(defvar mule-version)
;;; 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.
+ "Yank currently displayed message entity.
By setting following-method as yank-content."
(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
(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 ()
+ ""
(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
+ (config-exec-flag wl-draft-config-exec-flag)
+ (mime-display-header-hook 'wl-highlight-headers)
+ mime-view-ignored-field-list ; all header.
+ (mime-edit-translate-buffer-hook
+ (append
+ '((lambda ()
+ (let ((wl-draft-config-exec-flag config-exec-flag))
+ (run-hooks 'wl-draft-send-hook)
+ (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)))
+ ", "))))))
+ 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)))
+ (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-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)
+(defalias 'wl-message-button-dispatcher-internal
+ 'mime-button-dispatcher)
;;; Summary
(defun wl-summary-burst-subr (children target number)
(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
+ (setq number (wl-summary-burst-subr
(mime-entity-children (car children))
target
number))
(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")))))
+ (with-temp-buffer
+ (insert (mime-entity-body (car children)))
+ (elmo-folder-append-buffer
+ target
+ (mime-entity-fetch-field message-entity
+ "Message-ID")))))
(setq children (cdr children)))
number))
(defun wl-summary-burst ()
+ ""
(interactive)
(let ((raw-buf (wl-message-get-original-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
+ (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))
+ (set-buffer (get-buffer wl-message-buffer))
(setq message-entity (get-text-property (point-min) 'mime-view-entity)))
(set-buffer raw-buf)
(setq children (mime-entity-children message-entity))
(when children
(message "Bursting...")
(wl-summary-burst-subr children target 0)
- (message "Bursting...done."))
+ (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.")
;;; 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
;;; 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))
;;; 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)
'((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
+ (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))
+ (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
+ (function elmo-mime-insert-header))
+ (add-hook 'elmo-message-text-content-inserted-hook 'wl-highlight-body-all)
+ (add-hook 'elmo-message-header-inserted-hook 'wl-highlight-headers))
+
-(provide 'wl-mime)
+(require 'product)
+(product-provide (provide 'wl-mime) (require 'wl-version))
;;; wl-mime.el ends here
projects / elisp / wanderlust.git / blobdiff