From: yamaoka <yamaoka>
Date: Mon, 28 Oct 2002 07:05:15 +0000 (+0000)
Subject: Synch with Oort Gnus.
X-Git-Tag: t-gnus-6_15_8-05-quimby~5
X-Git-Url: http://git.chise.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=83e924fe02ac3752fe1b529e9b6751b1bb9a20d0;p=elisp%2Fgnus.git-

Synch with Oort Gnus.
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 0e96572..c9604a6 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,10 @@
+2002-10-28  Katsumi Yamaoka  <yamaoka@jpl.org>
+	From mah@everybody.org (Mark A. Hershberger).
+
+	* mm-url.el (mm-url-insert-file-contents): Make it return the same
+	type values ("url" size) regardless of the values of
+	mm-url-use-external.
+
 2002-10-26  Kai Gro,A_(Bjohann  <kai.grossjohann@uni-duisburg.de>
 
 	* nnimap.el (nnimap-request-article-part): Try harder to show
diff --git a/lisp/mm-url.el b/lisp/mm-url.el
index fb19b42..c7f08be 100644
--- a/lisp/mm-url.el
+++ b/lisp/mm-url.el
@@ -270,9 +270,12 @@ This is taken from RFC 2396.")
 
 (defun mm-url-insert-file-contents (url)
   (if mm-url-use-external
-      (if (string-match "^file:/+" url)
-	  (insert-file-contents (substring url (1- (match-end 0))))
-	(mm-url-insert-file-contents-external url))
+      (progn
+	(if (string-match "^file:/+" url)
+	    (insert-file-contents (substring url (1- (match-end 0))))
+	  (mm-url-insert-file-contents-external url))
+	(goto-char (point-min))
+	(list url (buffer-size)))
     (mm-url-load-url)
     (let ((name buffer-file-name)
 	  (url-package-name (or mm-url-package-name