tm 7.94.

[elisp/tm.git] / tm-body.el

diff --git a/tm-body.el b/tm-body.el
index d23fd77..ad1d61d 100644 (file)
--- a/tm-body.el
+++ b/tm-body.el
@@ -1,5 +1,5 @@
 ;;;
-;;; $Id: tm-body.el,v 0.14 1994/08/03 05:31:33 morioka Exp $
+;;; $Id: tm-body.el,v 0.16 1994/08/20 12:38:07 morioka Exp $
 ;;;
 
 (provide 'tm-body)
@@ -50,18 +50,12 @@
     ("image/jpeg"   . "tm-image")
     ("image/tiff"   . "tm-image")
     ("image/x-tiff" . "tm-image")
+    ("image/x-xbm"  . "tm-image")
     ("image/x-pic"  . "tm-image")
     ("video/mpeg"   . "tm-mpeg")
     ("application/octet-stream" . "tm-file")
     ))
-;;; (setq mime/content-decoding-method-alist
-;;;   '(("audio/basic" . "tm-au")
-;;;    ("image/gif"   . "tm-image")
-;;;    ("image/jpeg"  . "tm-image")
-;;;    ("image/x-pic" . "tm-image")
-;;;    ("video/mpeg"  . "tm-mpeg")
-;;;    ("application/octet-stream" . "tm-file")
-;;;    ))
+
 (defvar mime/use-internal-decoder nil)
 ;;; (setq mime/use-internal-decoder t)
 
@@ -106,7 +100,8 @@
                                                 default-encoding))
           (mime/decode-content boundary
                                (car ctype) encoding
-                               (mime/get-name ctype))
+                               (mime/get-name ctype boundary)
+                               )
           )
       )))
 
@@ -176,13 +171,6 @@
        (kill-buffer "FULL")
        ))
     ))
-    
-(defun mime/get-name (ctype)
-  (replace-as-filename
-   (or (cdr (assoc "name" (cdr ctype)))
-       (cdr (assoc "x-name" (cdr ctype)))
-       (message/get-field-body "Content-Description")
-       "")))
 
 (defun mime/narrow-to-content (boundary)
   (if boundary
@@ -195,6 +183,17 @@
        (goto-char (point-min))
        )))
 
+(defun mime/get-name (ctype &optional boundary)
+  (save-excursion
+    (save-restriction
+      (mime/narrow-to-content boundary)
+      (replace-as-filename
+       (or (cdr (assoc "name" (cdr ctype)))
+          (cdr (assoc "x-name" (cdr ctype)))
+          (message/get-field-body "Content-Description")
+          ""))
+      )))
+
 (defun mime/Content-Type (&optional boundary)
   (save-excursion
     (save-restriction