comparison lisp/mail/rmailmm.el @ 112238:4f72b1e43644

Merge from emacs-23 branch.
author Glenn Morris <rgm@gnu.org>
date Sat, 15 Jan 2011 12:03:38 -0800
parents 417b1e4d63cd
children cc0887b67703
comparison
equal deleted inserted replaced
112236:105ba04b561c 112238:4f72b1e43644
740 (delete-char (- (aref segment 4) (aref segment 3)))) 740 (delete-char (- (aref segment 4) (aref segment 3))))
741 (if (aref new 2) 741 (if (aref new 2)
742 (cond ((eq (cdr bulk-data) 'text) 742 (cond ((eq (cdr bulk-data) 'text)
743 (rmail-mime-insert-decoded-text entity)) 743 (rmail-mime-insert-decoded-text entity))
744 ((cdr bulk-data) 744 ((cdr bulk-data)
745 (rmail-mime-insert-image entity))))) 745 (rmail-mime-insert-image entity))
746 (t
747 ;; As we don't know how to display the body, just
748 ;; insert it as a text.
749 (rmail-mime-insert-decoded-text entity)))))
746 (put-text-property beg (point) 'rmail-mime-entity entity))) 750 (put-text-property beg (point) 'rmail-mime-entity entity)))
747 751
748 (defun test-rmail-mime-bulk-handler () 752 (defun test-rmail-mime-bulk-handler ()
749 "Test of a mail used as an example in RFC 2183." 753 "Test of a mail used as an example in RFC 2183."
750 (let ((mail "Content-Type: image/jpeg 754 (let ((mail "Content-Type: image/jpeg
818 822
819 ;; Change content-type to the proper default one for the children. 823 ;; Change content-type to the proper default one for the children.
820 (cond ((string-match "mixed" subtype) 824 (cond ((string-match "mixed" subtype)
821 (setq content-type '("text/plain"))) 825 (setq content-type '("text/plain")))
822 ((string-match "digest" subtype) 826 ((string-match "digest" subtype)
823 (setq content-type '("message/rfc822")))) 827 (setq content-type '("message/rfc822")))
828 (t
829 (setq content-type nil)))
824 830
825 ;; Loop over all body parts, where beg points at the beginning of 831 ;; Loop over all body parts, where beg points at the beginning of
826 ;; the part and end points at the end of the part. next points at 832 ;; the part and end points at the end of the part. next points at
827 ;; the beginning of the next part. The current point is just 833 ;; the beginning of the next part. The current point is just
828 ;; after the boundary tag. 834 ;; after the boundary tag.