- (setq default-ctl (or (mime-read-Content-Type) default-ctl))
- (let ((primtype (car default-ctl))
- (subtype (car (cdr default-ctl)))
- (params (cdr (cdr default-ctl)))
- (encoding (or (mime/Content-Transfer-Encoding) default-encoding))
- )
- (let ((boundary (assoc "boundary" params)))
- (cond (boundary
- (setq boundary (std11-strip-quoted-string (cdr boundary)))
- (mime-parse-multipart
- boundary
- primtype subtype params encoding rcnum)
- )
- ((and (eq primtype 'message)
- (memq subtype '(rfc822 news))
- )
- (goto-char (point-min))
- (make-mime-entity rcnum (point-min) (point-max)
- primtype subtype params encoding
- (save-restriction
- (narrow-to-region
- (if (re-search-forward "^$" nil t)
- (1+ (match-end 0))
- (point-min)
- )
- (point-max))
- (list (mime-parse-message
- nil nil (cons 0 rcnum)))
- ))
- )
- (t
- (make-mime-entity rcnum (point-min) (point-max)
- primtype subtype params encoding
- nil)
- ))
- )))
+ (let* ((content-type (or (mime-read-Content-Type) default-ctl))
+ (encoding (mime-read-Content-Transfer-Encoding default-encoding))
+ (boundary (assoc "boundary"
+ (mime-content-type-parameters content-type))))
+ (cond (boundary
+ (setq boundary (std11-strip-quoted-string (cdr boundary)))
+ (mime-parse-multipart boundary content-type encoding node-id)
+ )
+ ((and (eq (mime-content-type-primary-type content-type)
+ 'message)
+ (memq (mime-content-type-subtype content-type)
+ '(rfc822 news))
+ )
+ (goto-char (point-min))
+ (make-mime-entity node-id (point-min) (point-max)
+ content-type encoding
+ (save-restriction
+ (narrow-to-region
+ (if (re-search-forward "^$" nil t)
+ (1+ (match-end 0))
+ (point-min)
+ )
+ (point-max))
+ (list (mime-parse-message
+ nil nil (cons 0 node-id)))
+ ))
+ )
+ (t
+ (make-mime-entity node-id (point-min) (point-max)
+ content-type encoding nil)
+ ))
+ ))