From: yamaoka <yamaoka>
Date: Thu, 18 Dec 2003 15:07:29 +0000 (+0000)
Subject: Synch to Gnus 200312181457.
X-Git-Url: http://git.chise.org/gitweb/?a=commitdiff_plain;h=fb9a7d42c5ec0172d7c81648e54cc7634c8f7e32;p=elisp%2Fgnus.git-

Synch to Gnus 200312181457.
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index ee80d4e..eae14f4 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2003-12-18  Reiner Steib  <Reiner.Steib@gmx.de>
+
+	* mm-url.el (mm-url-insert-file-contents-external)
+	(mm-url-insert-file-contents): Added doc-strings.  Autoload.
+
 2003-12-18  Jesper Harder  <harder@ifa.au.dk>
 
 	* gnus-cus.el (defvar): defvar
diff --git a/lisp/mm-url.el b/lisp/mm-url.el
index 53773e2..7ff8140 100644
--- a/lisp/mm-url.el
+++ b/lisp/mm-url.el
@@ -272,7 +272,10 @@ This is taken from RFC 2396.")
     (require 'w3-vars)
     (require 'url)))
 
+;;;###autoload
 (defun mm-url-insert-file-contents (url)
+  "Insert file contents of URL.
+If `mm-url-use-external' is non-nil, use `mm-url-program'."
   (if mm-url-use-external
       (progn
 	(if (string-match "^file:/+" url)
@@ -280,7 +283,7 @@ This is taken from RFC 2396.")
 	  (mm-url-insert-file-contents-external url))
 	(goto-char (point-min))
 	(if (fboundp 'url-generic-parse-url)
-	    (setq url-current-object 
+	    (setq url-current-object
 		  (url-generic-parse-url url)))
 	(list url (buffer-size)))
     (mm-url-load-url)
@@ -303,7 +306,9 @@ This is taken from RFC 2396.")
 				    (car result))))
       result)))
 
+;;;###autoload
 (defun mm-url-insert-file-contents-external (url)
+  "Insert file contents of URL using `mm-url-program'."
   (let (program args)
     (if (symbolp mm-url-program)
 	(let ((item (cdr (assq mm-url-program mm-url-predefined-programs))))