Mercurial > emacs
comparison lisp/gnus/mml.el @ 69247:6580c61aced7
Revision: emacs@sv.gnu.org/emacs--devo--0--patch-134
Merge from gnus--rel--5.10
Patches applied:
* gnus--rel--5.10 (patch 43-48)
- Munge arch explicit ids in etc/images to match Emacs
- Update from CVS
author | Miles Bader <miles@gnu.org> |
---|---|
date | Fri, 03 Mar 2006 07:45:27 +0000 |
parents | d9dde5b81e71 |
children | ab0b847baba4 5754737d1e04 |
comparison
equal
deleted
inserted
replaced
69246:6e1a513dfa3b | 69247:6580c61aced7 |
---|---|
505 ((and filename | 505 ((and filename |
506 (not (equal (cdr (assq 'nofile cont)) "yes"))) | 506 (not (equal (cdr (assq 'nofile cont)) "yes"))) |
507 (let ((coding-system-for-read mm-binary-coding-system)) | 507 (let ((coding-system-for-read mm-binary-coding-system)) |
508 (mm-insert-file-contents filename nil nil nil nil t))) | 508 (mm-insert-file-contents filename nil nil nil nil t))) |
509 (t | 509 (t |
510 (insert (cdr (assq 'contents cont))))) | 510 (let ((contents (cdr (assq 'contents cont)))) |
511 (if (if (featurep 'xemacs) | |
512 (string-match "[^\000-\377]" contents) | |
513 (mm-multibyte-string-p contents)) | |
514 (progn | |
515 (mm-enable-multibyte) | |
516 (insert contents) | |
517 (setq charset (mm-encode-body))) | |
518 (insert contents))))) | |
511 (setq encoding (mm-encode-buffer type) | 519 (setq encoding (mm-encode-buffer type) |
512 coded (mm-string-as-multibyte (buffer-string)))) | 520 coded (mm-string-as-multibyte (buffer-string)))) |
513 (mml-insert-mime-headers cont type charset encoding nil) | 521 (mml-insert-mime-headers cont type charset encoding nil) |
514 (insert "\n") | 522 (insert "\n") |
515 (mm-with-unibyte-current-buffer | 523 (mm-with-unibyte-current-buffer |