X-Git-Url: https://cgit.sxemacs.org/?a=blobdiff_plain;ds=sidebyside;f=lisp%2Fmm-extern.el;h=b6bf1639343f0f39f143bd5472a2446af9a325fd;hb=8b87e18f7b6e6fced757c12428271a9433d335bd;hp=76255bfa6c24d2042de8d128205fca07c5225795;hpb=af6580d6924569dd823df567d31be113130a7f18;p=gnus

diff --git a/lisp/mm-extern.el b/lisp/mm-extern.el
index 76255bfa6..b6bf16393 100644
--- a/lisp/mm-extern.el
+++ b/lisp/mm-extern.el
@@ -1,5 +1,5 @@
 ;;; mm-extern.el --- showing message/external-body
-;; Copyright (C) 2000, 2001 Free Software Foundation, Inc.
+;; Copyright (C) 2000, 2001, 2003 Free Software Foundation, Inc.
 
 ;; Author: Shenghuo Zhu <zsh@cs.rochester.edu>
 ;; Keywords: message external-body
@@ -29,6 +29,7 @@
 
 (require 'mm-util)
 (require 'mm-decode)
+(require 'mm-url)
 
 (defvar mm-extern-function-alist
   '((local-file . mm-extern-local-file)
@@ -48,22 +49,21 @@
 	(coding-system-for-read mm-binary-coding-system))
     (unless name
       (error "The filename is not specified"))
-    (mm-disable-multibyte-mule4)
+    (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)))))
 
 (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)
+    (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)
@@ -79,7 +79,7 @@
 	 (coding-system-for-read mm-binary-coding-system))
     (unless name
       (error "The filename is not specified"))
-    (mm-disable-multibyte-mule4)
+    (mm-disable-multibyte)
     (mm-insert-file-contents path nil nil nil nil t)))
 
 (defun mm-extern-ftp (handle)
@@ -98,7 +98,7 @@
 	  (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.")