Revision: miles@gnu.org--gnu-2005/gnus--devo--0--patch-151

[gnus] / lisp / mm-extern.el

diff --git a/lisp/mm-extern.el b/lisp/mm-extern.el
index ec5c9b1..6792d0d 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, 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
@@ -18,18 +18,18 @@
 
 ;; You should have received a copy of the GNU General Public License
 ;; along with GNU Emacs; see the file COPYING.  If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
 
 ;;; Commentary:
 
 ;;; 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,23 +48,22 @@
   (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 "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)
@@ -79,8 +78,8 @@
                       "@" 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)
@@ -99,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.")
@@ -119,13 +118,13 @@ If NO-DISPLAY is nil, display it. Otherwise, do nothing after replacing."
         (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 "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)
@@ -164,4 +163,7 @@ 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)
+
+;;; arch-tag: 9653808e-14d9-4172-86e6-adceaa05378e
+;;; mm-extern.el ends here