From: morioka <morioka>
Date: Fri, 5 Sep 1997 07:10:59 +0000 (+0000)
Subject: (mime-edit-decode-buffer): Modify for new return format of
X-Git-Tag: semi-0_112~38
X-Git-Url: http://git.chise.org/gitweb/?a=commitdiff_plain;h=d5aa83dc4fe84bfd3c30ee0764261147551ba6df;p=elisp%2Fsemi.git

(mime-edit-decode-buffer): Modify for new return format of
`mime-parse-Content-Type'.
---

diff --git a/mime-edit.el b/mime-edit.el
index 417f198..90dcc5a 100644
--- a/mime-edit.el
+++ b/mime-edit.el
@@ -7,7 +7,7 @@
 ;; Maintainer: MORIOKA Tomohiko <morioka@jaist.ac.jp>
 ;; Created: 1994/08/21 renamed from mime.el
 ;;	Renamed: 1997/2/21 from tm-edit.el
-;; Version: $Revision: 0.87 $
+;; Version: $Revision: 0.88 $
 ;; Keywords: MIME, multimedia, multilingual, mail, news
 
 ;; This file is part of SEMI (SEMI is Emacs MIME Interfaces).
@@ -122,7 +122,7 @@
 ;;;
 
 (defconst mime-edit-RCS-ID
-  "$Id: mime-edit.el,v 0.87 1997-09-03 04:53:10 morioka Exp $")
+  "$Id: mime-edit.el,v 0.88 1997-09-05 07:10:59 morioka Exp $")
 
 (defconst mime-edit-version `,(get-version-string mime-edit-RCS-ID))
 
@@ -2474,21 +2474,15 @@ Content-Type: message/partial; id=%s; number=%d; total=%d\n%s\n"
     (goto-char (point-min))
     (let ((ctl (mime-read-Content-Type)))
       (if ctl
-	  (let ((ctype (car ctl))
-		(params (cdr ctl))
-		type stype)
-	    (if (string-match "/" ctype)
-		(progn
-		  (setq type (substring ctype 0 (match-beginning 0)))
-		  (setq stype (substring ctype (match-end 0)))
-		  )
-	      (setq type ctype)
-	      )
+	  (let ((type (car ctl))
+		(stype (car (cdr ctl)))
+		(params (cdr (cdr ctl)))
+		)
 	    (cond
-	     ((string= ctype "application/pgp-signature")
+	     ((and (eq type 'application)(eq stype 'pgp-signature))
 	      (delete-region (point-min)(point-max))
 	      )
-	     ((string= type "multipart")
+	     ((eq type 'multipart)
 	      (let* ((boundary (cdr (assoc "boundary" params)))
 		     (boundary-pat
 		      (concat "\n--" (regexp-quote boundary) "[ \t]*\n"))
@@ -2531,12 +2525,13 @@ Content-Type: message/partial; id=%s; number=%d; total=%d\n%s\n"
 				     )))
 		))
 	     (t
-	      (let* (charset
+	      (let* ((ctype (format "%s/%s" type stype))
+		     charset
 		     (pstr
 		      (let ((bytes (+ 14 (length ctype))))
 			(mapconcat (function
 				    (lambda (attr)
-				      (if (string-equal (car attr) "charset")
+				      (if (string= (car attr) "charset")
 					  (progn
 					    (setq charset (cdr attr))
 					    "")
@@ -2566,7 +2561,7 @@ Content-Type: message/partial; id=%s; number=%d; total=%d\n%s\n"
 			      (eliminate-top-spaces
 			       (std11-unfold-string
 				(buffer-substring hbeg end))))
-			(if (or charset (string-equal type "text"))
+			(if (or charset (eq type 'text))
 			    (progn
 			      (delete-region beg (1+ end))
 			      (goto-char (point-min))
@@ -2593,12 +2588,14 @@ Content-Type: message/partial; id=%s; number=%d; total=%d\n%s\n"
 			(insert
 			 (concat "\n"
 				 (mime-create-tag
-				  (concat type "/" stype pstr) encoding)))
+				  (format "%s/%s%s" type stype pstr)
+				  encoding)))
 			)
 		    (delete-region (point-min) he)
 		    (insert
 		     (mime-create-tag
-		      (concat type "/" stype pstr) encoding))
+		      (format "%s/%s%s" type stype pstr)
+		      encoding))
 		    ))
 		))))
 	(or not-decode-text