2000-11-02 19:51:19 ShengHuo ZHU <zsh@cs.rochester.edu>

	* mml.el (mml-generate-mime-1): Support external url.
	* nnwarchive.el (nnwarchive-mail-archive-article): Use external url.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index f7a6e61..2afbba2 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2000-11-02 19:51:19  ShengHuo ZHU  <zsh@cs.rochester.edu>
+
+       * mml.el (mml-generate-mime-1): Support external url.
+       * nnwarchive.el (nnwarchive-mail-archive-article): Use external url.
+
 2000-11-02 16:53:32  ShengHuo ZHU  <zsh@cs.rochester.edu>
 
        * mm-partial.el (mm-inline-partial): Buffer name with a leading space.

diff --git a/lisp/mml.el b/lisp/mml.el
index 64ba761..589988c 100644 (file)
--- a/lisp/mml.el
+++ b/lisp/mml.el
@@ -347,7 +347,8 @@ If MML is non-nil, return the buffer up till the correspondent mml tag."
        (insert "Content-Type: message/external-body")
        (let ((parameters (mml-parameter-string
                           cont '(expiration size permission)))
-             (name (cdr (assq 'name cont))))
+             (name (cdr (assq 'name cont)))
+             (url (cdr (assq 'url cont))))
          (when name
            (setq name (mml-parse-file-name name))
            (if (stringp name)
@@ -365,6 +366,10 @@ If MML is non-nil, return the buffer up till the correspondent mml tag."
                       (if (member (nth 0 name) '("ftp@" "anonymous@"))
                           "anon-ftp"
                         "ftp")))))      
+         (when url
+           (mml-insert-parameter
+            (mail-header-encode-parameter "url" url)
+            "access-type=url"))
          (when parameters
            (mml-insert-parameter-string
             cont '(expiration size permission))))

diff --git a/lisp/nnwarchive.el b/lisp/nnwarchive.el
index 5103b55..1a34dde 100644 (file)
--- a/lisp/nnwarchive.el
+++ b/lisp/nnwarchive.el
@@ -696,14 +696,17 @@
                             (progn (forward-line) (point)))
              ;; I hate to download the url encode it, then immediately 
              ;; decode it.
-             ;; FixMe: Find a better solution to attach the URL.
-             ;; Maybe do some hack in external part of mml-generate-mim-1.
-             (insert "<#part>"
-                     "\n--\nExternal: \n"
-                     (format "<URL:http://www.mail-archive.com/%s/%s>" 
+             (insert "<#external"
+                     " type="
+                     (or (and url
+                              (string-match "\\.[^\\.]+$" url)
+                              (mailcap-extension-to-mime
+                               (match-string 0 url)))
+                         "application/octet-stream")
+                     (format " url=\"http://www.mail-archive.com/%s/%s\"" 
                              group url)
-                     "\n--\n"
-                     "<#/part>")
+                     ">\n"
+                     "<#/external>")
              (setq mime t))
             (t
              (setq p (point))