X-Git-Url: http://cgit.sxemacs.org/?a=blobdiff_plain;f=lisp%2Fmm-extern.el;h=f4c728541e9816e7b9d619935bade755ecb214d7;hb=0af3e998148631b9f083184a507da0292a24481a;hp=e9c07fbdde90c6ec88e989f110c504ade5e25226;hpb=8df42eb2f0d39fb4f9a9788d5c90a5ae66e7a294;p=gnus

diff --git a/lisp/mm-extern.el b/lisp/mm-extern.el
index e9c07fbdd..f4c728541 100644
--- a/lisp/mm-extern.el
+++ b/lisp/mm-extern.el
@@ -1,5 +1,7 @@
 ;;; mm-extern.el --- showing message/external-body
-;; Copyright (C) 2000 Free Software Foundation, Inc.
+
+;; Copyright (C) 2000, 2001, 2002, 2003, 2004,
+;;   2005, 2006 Free Software Foundation, Inc.
 
 ;; Author: Shenghuo Zhu <zsh@cs.rochester.edu>
 ;; Keywords: message external-body
@@ -18,18 +20,20 @@
 
 ;; 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 gnus-article-mime-handles)
 
 (defvar mm-extern-function-alist
   '((local-file . mm-extern-local-file)
@@ -48,23 +52,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 +82,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)
@@ -94,12 +97,12 @@
 	 (subject (or (cdr (assq 'subject params)) "none"))
 	 (buf (current-buffer))
 	 info)
-    (if (y-or-n-p (format "Send a request message to %s?" server))
+    (if (y-or-n-p (format "Send a request message to %s? " server))
 	(save-window-excursion
 	  (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.")
@@ -108,59 +111,59 @@
     (goto-char (point-min))
     (insert "[" info "]\n\n")))
 
+;;;###autoload
+(defun mm-extern-cache-contents (handle)
+  "Put the external-body part of HANDLE into its cache."
+  (let* ((access-type (cdr (assq 'access-type
+				 (cdr (mm-handle-type handle)))))
+	 (func (cdr (assq (intern
+			   (downcase
+			    (or access-type
+				(error "Couldn't find access type"))))
+			  mm-extern-function-alist)))
+	 buf handles)
+    (unless func
+      (error "Access type (%s) is not supported" access-type))
+    (mm-with-part handle
+      (goto-char (point-max))
+      (insert "\n\n")
+      ;; It should be just a single MIME handle.
+      (setq handles (mm-dissect-buffer t)))
+    (unless (bufferp (car handles))
+      (mm-destroy-parts handles)
+      (error "Multipart external body is not supported"))
+    (save-excursion
+      (set-buffer (setq buf (mm-handle-buffer handles)))
+      (let (good)
+	(unwind-protect
+	    (progn
+	      (funcall func handle)
+	      (setq good t))
+	  (unless good
+	    (mm-destroy-parts handles))))
+      (mm-handle-set-cache handle handles))
+    (setq gnus-article-mime-handles
+	  (mm-merge-handles gnus-article-mime-handles handles))))
+
 ;;;###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 
-				 (cdr (mm-handle-type handle)))))
-	 (func (cdr (assq (intern 
-			   (downcase 
-			    (or 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)))
-      (with-temp-buffer
-	(mm-insert-part handle)
-	(goto-char (point-max))
-	(insert "\n\n")
-	(setq handles (mm-dissect-buffer t)))
-      (unless (bufferp (car handles))
-	(mm-destroy-parts handles)
-	(error "Multipart external body is not supported."))
-      (save-excursion ;; single part
-	(set-buffer (setq buf (mm-handle-buffer handles)))
-	(let (good)
-	  (unwind-protect
-	      (progn
-		(funcall func handle)
-		(setq good t))
-	    (unless good
-	      (mm-destroy-parts handles))))
-	(mm-handle-set-cache handle handles))
-      (push handles gnus-article-mime-handles))
-    (unless no-display
-      (save-excursion
-	(save-restriction
-	  (narrow-to-region (point) (point))
-	  (gnus-display-mime (mm-handle-cache handle))
-	  (mm-handle-set-undisplayer
-	   handle
-	   `(lambda ()
-	      (let (buffer-read-only)
-		(condition-case nil
-		    ;; This is only valid on XEmacs.
-		    (mapcar (lambda (prop)
-			    (remove-specifier
-			     (face-property 'default prop) (current-buffer)))
-			    '(background background-pixmap foreground))
-		  (error nil))
-		(delete-region ,(point-min-marker) ,(point-max-marker))))))))))
-
-;; mm-extern.el ends here
+  (unless (mm-handle-cache handle)
+    (mm-extern-cache-contents handle))
+  (unless no-display
+    (save-excursion
+      (save-restriction
+	(narrow-to-region (point) (point))
+	(mm-display-part (mm-handle-cache handle))))
+    ;; Move undisplayer added to the cached handle to the parent.
+    (mm-handle-set-undisplayer
+     handle (mm-handle-undisplayer (mm-handle-cache handle)))
+    (mm-handle-set-undisplayer (mm-handle-cache handle) nil)))
+
+(provide 'mm-extern)
+
+;;; arch-tag: 9653808e-14d9-4172-86e6-adceaa05378e
+;;; mm-extern.el ends here