* gnus-fun.el (gnus-shell-command-to-string): New function.

[gnus] / lisp / mm-extern.el

diff --git a/lisp/mm-extern.el b/lisp/mm-extern.el
index e9c07fb..dfad89f 100644 (file)
--- a/lisp/mm-extern.el
+++ b/lisp/mm-extern.el
@@ -1,5 +1,5 @@
 ;;; mm-extern.el --- showing message/external-body
-;; Copyright (C) 2000 Free Software Foundation, Inc.
+;; Copyright (C) 2000, 2001 Free Software Foundation, Inc.
 
 ;; Author: Shenghuo Zhu <zsh@cs.rochester.edu>
 ;; Keywords: message external-body
@@ -25,11 +25,11 @@
 
 ;;; 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)
@@ -48,22 +48,21 @@
   (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."))
+      (error "The filename is not specified"))
     (mm-disable-multibyte-mule4)
     (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."))
+      (error "URL is not specified"))
     (mm-with-unibyte-current-buffer-mule4
-      (url-insert-file-contents url))
+      (mm-url-insert-file-contents url))
     (mm-disable-multibyte-mule4)
     (setq buffer-file-name name)))
 
@@ -79,7 +78,7 @@
                       "@" site ":" directory "/" name))
         (coding-system-for-read mm-binary-coding-system))
     (unless name
-      (error "The filename is not specified."))
+      (error "The filename is not specified"))
     (mm-disable-multibyte-mule4)
     (mm-insert-file-contents path nil nil nil nil t)))
 
@@ -111,21 +110,21 @@
 ;;;###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))
@@ -133,7 +132,7 @@ If NO-DISPLAY is nil, display it. Otherwise, do nothing after replacing."
        (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)
@@ -144,7 +143,8 @@ If NO-DISPLAY is nil, display it. Otherwise, do nothing after replacing."
            (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
@@ -163,4 +163,6 @@ If NO-DISPLAY is nil, display it. Otherwise, do nothing after replacing."
                  (error nil))
                (delete-region ,(point-min-marker) ,(point-max-marker))))))))))
 
-;; mm-extern.el ends here
+(provide 'mm-extern)
+
+;;; mm-extern.el ends here