;;; mm-extern.el --- showing message/external-body
-;; Copyright (C) 2000 Free Software Foundation, Inc.
+;; Copyright (C) 2000, 2001, 2003 Free Software Foundation, Inc.
;; Author: Shenghuo Zhu <zsh@cs.rochester.edu>
;; Keywords: message external-body
;;; Code:
-(eval-when-compile
- (require 'cl))
+(eval-when-compile (require 'cl))
(require 'mm-util)
(require 'mm-decode)
+(require 'mm-url)
(defvar mm-extern-function-alist
'((local-file . mm-extern-local-file)
(let ((name (cdr (assq 'name (cdr (mm-handle-type handle)))))
(coding-system-for-read mm-binary-coding-system))
(unless name
- (error "The filename is not specified."))
- (mm-disable-multibyte-mule4)
+ (error "The filename is not specified"))
+ (mm-disable-multibyte)
(if (file-exists-p name)
(mm-insert-file-contents name nil nil nil nil t)
- (error (format "File %s is gone." name)))))
+ (error (format "File %s is gone" name)))))
(defun mm-extern-url (handle)
(erase-buffer)
- (require 'url)
(let ((url (cdr (assq 'url (cdr (mm-handle-type handle)))))
(name buffer-file-name)
(coding-system-for-read mm-binary-coding-system))
(unless url
- (error "URL is not specified."))
- (mm-with-unibyte-current-buffer-mule4
- (url-insert-file-contents url))
- (mm-disable-multibyte-mule4)
+ (error "URL is not specified"))
+ (mm-with-unibyte-current-buffer
+ (mm-url-insert-file-contents url))
+ (mm-disable-multibyte)
(setq buffer-file-name name)))
(defun mm-extern-anon-ftp (handle)
"@" site ":" directory "/" name))
(coding-system-for-read mm-binary-coding-system))
(unless name
- (error "The filename is not specified."))
- (mm-disable-multibyte-mule4)
+ (error "The filename is not specified"))
+ (mm-disable-multibyte)
(mm-insert-file-contents path nil nil nil nil t)))
(defun mm-extern-ftp (handle)
(message-mail server subject)
(message-goto-body)
(delete-region (point) (point-max))
- (insert-buffer buf)
+ (insert-buffer-substring buf)
(message "Requesting external body...")
(message-send-and-exit)
(setq info "Request is sent.")
;;;###autoload
(defun mm-inline-external-body (handle &optional no-display)
"Show the external-body part of HANDLE.
-This function replaces the buffer of HANDLE with a buffer contains
+This function replaces the buffer of HANDLE with a buffer contains
the entire message.
If NO-DISPLAY is nil, display it. Otherwise, do nothing after replacing."
- (let* ((access-type (cdr (assq 'access-type
+ (let* ((access-type (cdr (assq 'access-type
(cdr (mm-handle-type handle)))))
- (func (cdr (assq (intern
- (downcase
+ (func (cdr (assq (intern
+ (downcase
(or access-type
- (error "Couldn't find access type."))))
+ (error "Couldn't find access type"))))
mm-extern-function-alist)))
gnus-displaying-mime buf
handles)
(unless (mm-handle-cache handle)
(unless func
- (error (format "Access type (%s) is not supported." access-type)))
+ (error (format "Access type (%s) is not supported" access-type)))
(with-temp-buffer
(mm-insert-part handle)
(goto-char (point-max))
(setq handles (mm-dissect-buffer t)))
(unless (bufferp (car handles))
(mm-destroy-parts handles)
- (error "Multipart external body is not supported."))
+ (error "Multipart external body is not supported"))
(save-excursion ;; single part
(set-buffer (setq buf (mm-handle-buffer handles)))
(let (good)
(unless good
(mm-destroy-parts handles))))
(mm-handle-set-cache handle handles))
- (push handles gnus-article-mime-handles))
+ (setq gnus-article-mime-handles
+ (mm-merge-handles gnus-article-mime-handles handles)))
(unless no-display
(save-excursion
(save-restriction
(error nil))
(delete-region ,(point-min-marker) ,(point-max-marker))))))))))
-;; mm-extern.el ends here
+(provide 'mm-extern)
+
+;;; mm-extern.el ends here